Remove unused option purge_redundant_kvs_while_flush (#9429)

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/9429

Test Plan: fake release for test: D33754513

Reviewed By: riversand963

Differential Revision: D33753637

Pulled By: jay-zhuang

fbshipit-source-id: 18db4701e8f28dda8f1ab660c2be9890a8312c12
main
Jay Zhuang 3 years ago committed by Facebook GitHub Bot
parent beb86addeb
commit 961d8dacf2
  1. 4
      db/c.cc
  2. 1
      examples/rocksdb_option_file_example.ini
  3. 4
      include/rocksdb/advanced_options.h
  4. 3
      include/rocksdb/c.h
  5. 6
      options/cf_options.cc
  6. 2
      options/cf_options.h
  7. 2
      options/options_helper.cc
  8. 1
      options/options_settable_test.cc
  9. 1
      test_util/testutil.cc
  10. 1
      tools/db_bench_tool_test.cc

@ -2959,10 +2959,6 @@ size_t rocksdb_options_get_manifest_preallocation_size(rocksdb_options_t* opt) {
return opt->rep.manifest_preallocation_size; return opt->rep.manifest_preallocation_size;
} }
// noop
void rocksdb_options_set_purge_redundant_kvs_while_flush(
rocksdb_options_t* /*opt*/, unsigned char /*v*/) {}
void rocksdb_options_set_use_direct_reads(rocksdb_options_t* opt, void rocksdb_options_set_use_direct_reads(rocksdb_options_t* opt,
unsigned char v) { unsigned char v) {
opt->rep.use_direct_reads = v; opt->rep.use_direct_reads = v;

@ -103,7 +103,6 @@
level0_stop_writes_trigger=20 level0_stop_writes_trigger=20
compression=kSnappyCompression compression=kSnappyCompression
level0_file_num_compaction_trigger=4 level0_file_num_compaction_trigger=4
purge_redundant_kvs_while_flush=true
max_write_buffer_size_to_maintain=0 max_write_buffer_size_to_maintain=0
memtable_factory=SkipListFactory memtable_factory=SkipListFactory
max_grandparent_overlap_factor=8 max_grandparent_overlap_factor=8

@ -930,10 +930,6 @@ struct AdvancedColumnFamilyOptions {
// NOT SUPPORTED ANYMORE -- this options is no longer used // NOT SUPPORTED ANYMORE -- this options is no longer used
unsigned int rate_limit_delay_max_milliseconds = 100; unsigned int rate_limit_delay_max_milliseconds = 100;
// NOT SUPPORTED ANYMORE
// Does not have any effect.
bool purge_redundant_kvs_while_flush = true;
}; };
} // namespace ROCKSDB_NAMESPACE } // namespace ROCKSDB_NAMESPACE

@ -1250,9 +1250,6 @@ extern ROCKSDB_LIBRARY_API void rocksdb_options_set_manifest_preallocation_size(
rocksdb_options_t*, size_t); rocksdb_options_t*, size_t);
extern ROCKSDB_LIBRARY_API size_t extern ROCKSDB_LIBRARY_API size_t
rocksdb_options_get_manifest_preallocation_size(rocksdb_options_t*); rocksdb_options_get_manifest_preallocation_size(rocksdb_options_t*);
extern ROCKSDB_LIBRARY_API void
rocksdb_options_set_purge_redundant_kvs_while_flush(rocksdb_options_t*,
unsigned char);
extern ROCKSDB_LIBRARY_API void rocksdb_options_set_allow_mmap_reads( extern ROCKSDB_LIBRARY_API void rocksdb_options_set_allow_mmap_reads(
rocksdb_options_t*, unsigned char); rocksdb_options_t*, unsigned char);
extern ROCKSDB_LIBRARY_API unsigned char rocksdb_options_get_allow_mmap_reads( extern ROCKSDB_LIBRARY_API unsigned char rocksdb_options_get_allow_mmap_reads(

@ -525,10 +525,6 @@ static std::unordered_map<std::string, OptionTypeInfo>
{offset_of(&ImmutableCFOptions::force_consistency_checks), {offset_of(&ImmutableCFOptions::force_consistency_checks),
OptionType::kBoolean, OptionVerificationType::kNormal, OptionType::kBoolean, OptionVerificationType::kNormal,
OptionTypeFlags::kNone}}, OptionTypeFlags::kNone}},
{"purge_redundant_kvs_while_flush",
{offset_of(&ImmutableCFOptions::purge_redundant_kvs_while_flush),
OptionType::kBoolean, OptionVerificationType::kDeprecated,
OptionTypeFlags::kNone}},
{"max_mem_compaction_level", {"max_mem_compaction_level",
{0, OptionType::kInt, OptionVerificationType::kDeprecated, {0, OptionType::kInt, OptionVerificationType::kDeprecated,
OptionTypeFlags::kNone}}, OptionTypeFlags::kNone}},
@ -853,8 +849,6 @@ ImmutableCFOptions::ImmutableCFOptions(const ColumnFamilyOptions& cf_options)
table_properties_collector_factories( table_properties_collector_factories(
cf_options.table_properties_collector_factories), cf_options.table_properties_collector_factories),
bloom_locality(cf_options.bloom_locality), bloom_locality(cf_options.bloom_locality),
purge_redundant_kvs_while_flush(
cf_options.purge_redundant_kvs_while_flush),
compression_per_level(cf_options.compression_per_level), compression_per_level(cf_options.compression_per_level),
level_compaction_dynamic_level_bytes( level_compaction_dynamic_level_bytes(
cf_options.level_compaction_dynamic_level_bytes), cf_options.level_compaction_dynamic_level_bytes),

@ -62,8 +62,6 @@ struct ImmutableCFOptions {
// to PlainTableOptions just like bloom_bits_per_key // to PlainTableOptions just like bloom_bits_per_key
uint32_t bloom_locality; uint32_t bloom_locality;
bool purge_redundant_kvs_while_flush;
std::vector<CompressionType> compression_per_level; std::vector<CompressionType> compression_per_level;
bool level_compaction_dynamic_level_bytes; bool level_compaction_dynamic_level_bytes;

@ -293,8 +293,6 @@ void UpdateColumnFamilyOptions(const ImmutableCFOptions& ioptions,
cf_opts->table_properties_collector_factories = cf_opts->table_properties_collector_factories =
ioptions.table_properties_collector_factories; ioptions.table_properties_collector_factories;
cf_opts->bloom_locality = ioptions.bloom_locality; cf_opts->bloom_locality = ioptions.bloom_locality;
cf_opts->purge_redundant_kvs_while_flush =
ioptions.purge_redundant_kvs_while_flush;
cf_opts->compression_per_level = ioptions.compression_per_level; cf_opts->compression_per_level = ioptions.compression_per_level;
cf_opts->level_compaction_dynamic_level_bytes = cf_opts->level_compaction_dynamic_level_bytes =
ioptions.level_compaction_dynamic_level_bytes; ioptions.level_compaction_dynamic_level_bytes;

@ -443,7 +443,6 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
options->hard_rate_limit = 0; options->hard_rate_limit = 0;
options->soft_rate_limit = 0; options->soft_rate_limit = 0;
options->num_levels = 42; // Initialize options for MutableCF options->num_levels = 42; // Initialize options for MutableCF
options->purge_redundant_kvs_while_flush = false;
options->max_mem_compaction_level = 0; options->max_mem_compaction_level = 0;
options->compaction_filter = nullptr; options->compaction_filter = nullptr;
options->sst_partitioner_factory = nullptr; options->sst_partitioner_factory = nullptr;

@ -391,7 +391,6 @@ void RandomInitCFOptions(ColumnFamilyOptions* cf_opt, DBOptions& db_options,
cf_opt->level_compaction_dynamic_level_bytes = rnd->Uniform(2); cf_opt->level_compaction_dynamic_level_bytes = rnd->Uniform(2);
cf_opt->optimize_filters_for_hits = rnd->Uniform(2); cf_opt->optimize_filters_for_hits = rnd->Uniform(2);
cf_opt->paranoid_file_checks = rnd->Uniform(2); cf_opt->paranoid_file_checks = rnd->Uniform(2);
cf_opt->purge_redundant_kvs_while_flush = rnd->Uniform(2);
cf_opt->force_consistency_checks = rnd->Uniform(2); cf_opt->force_consistency_checks = rnd->Uniform(2);
cf_opt->compaction_options_fifo.allow_compaction = rnd->Uniform(2); cf_opt->compaction_options_fifo.allow_compaction = rnd->Uniform(2);
cf_opt->memtable_whole_key_filtering = rnd->Uniform(2); cf_opt->memtable_whole_key_filtering = rnd->Uniform(2);

@ -266,7 +266,6 @@ const std::string options_file_content = R"OPTIONS_FILE(
inplace_update_support=false inplace_update_support=false
compaction_style=kCompactionStyleUniversal compaction_style=kCompactionStyleUniversal
memtable_prefix_bloom_probes=6 memtable_prefix_bloom_probes=6
purge_redundant_kvs_while_flush=true
filter_deletes=false filter_deletes=false
hard_pending_compaction_bytes_limit=0 hard_pending_compaction_bytes_limit=0
disable_auto_compactions=false disable_auto_compactions=false

Loading…
Cancel
Save