Make the options in table_builder/block_builder less misleading

Summary:
By original design, the regular `block options` and index `block options` in table_builder is mutable. We can use ChangeOptions to change the options directly.

However, with my last change, `BlockBuilder` no longer hold the reference to the index_block_options -- as a result, any changes made after the creation of index block builder will be of no effect.

But still the code is very error-prone and developers can easily fall into the trap without aware of it. To avoid this problem from happening in the future, I deleted the `ChangeOptions` and the `index_block_options`, as well as many other changes to make it less misleading.

Test Plan:
make
make check
make release

Reviewers: dhruba, haobo

Reviewed By: haobo

CC: leveldb

Differential Revision: https://reviews.facebook.net/D13707
This commit is contained in:
Kai Liu
2013-11-16 23:21:15 -08:00
parent f7a2b972a8
commit 7604e2f70c
5 changed files with 11 additions and 11 deletions

View File

@@ -77,7 +77,6 @@ void LogStatsCollectionError(
struct BlockBasedTableBuilder::Rep {
Options options;
Options index_block_options;
WritableFile* file;
uint64_t offset = 0;
Status status;
@@ -105,10 +104,11 @@ struct BlockBasedTableBuilder::Rep {
Rep(const Options& opt, WritableFile* f, CompressionType compression_type)
: options(opt),
index_block_options(opt),
file(f),
data_block(&options),
index_block(1, index_block_options.comparator),
data_block(options),
// To avoid linear scan, we make the block_restart_interval to be `1`
// in index block builder
index_block(1 /* block_restart_interval */, options.comparator),
compression_type(compression_type),
filter_block(opt.filter_policy == nullptr ? nullptr
: new FilterBlockBuilder(opt)) {