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

Fix merge test

Browse Source 
Copy max_successive_merges from options to column family options
This commit is contained in:
Igor Canadi 2014-01-13 13:27:43 -08:00
parent a107691711
commit 00065d0d5d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/options.cc
View File

@ -69,7 +69,8 @@ ColumnFamilyOptions::ColumnFamilyOptions()
table_factory( table_factory(
std::shared_ptr<TableFactory>(new BlockBasedTableFactory())), std::shared_ptr<TableFactory>(new BlockBasedTableFactory())),
inplace_update_support(false), inplace_update_support(false),
inplace_update_num_locks(10000) { inplace_update_num_locks(10000),
max_successive_merges(0) {
assert(memtable_factory.get() != nullptr); assert(memtable_factory.get() != nullptr);
} }
@ -129,7 +130,7 @@ ColumnFamilyOptions::ColumnFamilyOptions(const Options& options)
table_properties_collectors(options.table_properties_collectors), table_properties_collectors(options.table_properties_collectors),
inplace_update_support(options.inplace_update_support), inplace_update_support(options.inplace_update_support),
inplace_update_num_locks(options.inplace_update_num_locks), inplace_update_num_locks(options.inplace_update_num_locks),
max_successive_merges(0) { max_successive_merges(options.max_successive_merges) {
assert(memtable_factory.get() != nullptr); assert(memtable_factory.get() != nullptr);
} }