andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix c_test

Browse Source 
Summary: as title

Test Plan: ./c_test

Reviewers: igor

Reviewed By: igor

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D28119
This commit is contained in:
Lei Jin 2014-10-31 15:04:01 -07:00
parent bc9f36fd5e
commit 82e3ae5403
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -132,7 +132,7 @@ TESTS = \
spatial_db_test \ spatial_db_test \
version_edit_test \ version_edit_test \
version_set_test \ version_set_test \
compaction_picker_test \ compaction_picker_test \
version_builder_test \ version_builder_test \
file_indexer_test \ file_indexer_test \
write_batch_test \ write_batch_test \

26
db/c_test.c
View File

@ -576,33 +576,39 @@ int main(int argc, char** argv) {
StartPhase("compaction_filter"); StartPhase("compaction_filter");
{ {
rocksdb_options_set_create_if_missing(options, 1); rocksdb_options_t* options_with_filter = rocksdb_options_create();
rocksdb_options_set_create_if_missing(options_with_filter, 1);
rocksdb_compactionfilter_t* cfilter; rocksdb_compactionfilter_t* cfilter;
cfilter = rocksdb_compactionfilter_create(NULL, CFilterDestroy, cfilter = rocksdb_compactionfilter_create(NULL, CFilterDestroy,
CFilterFilter, CFilterName); CFilterFilter, CFilterName);
// Create new database // Create new database
rocksdb_close(db); rocksdb_close(db);
rocksdb_destroy_db(options, dbname, &err); rocksdb_destroy_db(options_with_filter, dbname, &err);
rocksdb_options_set_compaction_filter(options, cfilter); rocksdb_options_set_compaction_filter(options_with_filter, cfilter);
db = CheckCompaction(db, options, roptions, woptions); db = CheckCompaction(db, options_with_filter, roptions, woptions);
rocksdb_options_set_compaction_filter(options, NULL); rocksdb_options_set_compaction_filter(options_with_filter, NULL);
rocksdb_compactionfilter_destroy(cfilter); rocksdb_compactionfilter_destroy(cfilter);
rocksdb_options_destroy(options_with_filter);
} }
StartPhase("compaction_filter_factory"); StartPhase("compaction_filter_factory");
{ {
rocksdb_options_set_create_if_missing(options, 1); rocksdb_options_t* options_with_filter_factory = rocksdb_options_create();
rocksdb_options_set_create_if_missing(options_with_filter_factory, 1);
rocksdb_compactionfilterfactory_t* factory; rocksdb_compactionfilterfactory_t* factory;
factory = rocksdb_compactionfilterfactory_create( factory = rocksdb_compactionfilterfactory_create(
NULL, CFilterFactoryDestroy, CFilterCreate, CFilterFactoryName); NULL, CFilterFactoryDestroy, CFilterCreate, CFilterFactoryName);
// Create new database // Create new database
rocksdb_close(db); rocksdb_close(db);
rocksdb_destroy_db(options, dbname, &err); rocksdb_destroy_db(options_with_filter_factory, dbname, &err);
rocksdb_options_set_compaction_filter_factory(options, factory); rocksdb_options_set_compaction_filter_factory(options_with_filter_factory,
db = CheckCompaction(db, options, roptions, woptions); factory);
db = CheckCompaction(db, options_with_filter_factory, roptions, woptions);
rocksdb_options_set_compaction_filter_factory(options, NULL); rocksdb_options_set_compaction_filter_factory(
options_with_filter_factory, NULL);
rocksdb_options_destroy(options_with_filter_factory);
} }
StartPhase("compaction_filter_v2"); StartPhase("compaction_filter_v2");