diff --git a/db/db_bench.cc b/db/db_bench.cc index e4fc1c445..e7486a24c 100644 --- a/db/db_bench.cc +++ b/db/db_bench.cc @@ -367,13 +367,19 @@ static std::vector FLAGS_max_bytes_for_level_multiplier_additional_v; DEFINE_string(max_bytes_for_level_multiplier_additional, "", "A vector that specifies additional fanout per level"); -DEFINE_int32(level0_stop_writes_trigger, 12, "Number of files in level-0" +DEFINE_int32(level0_stop_writes_trigger, + rocksdb::Options().level0_stop_writes_trigger, + "Number of files in level-0" " that will trigger put stop."); -DEFINE_int32(level0_slowdown_writes_trigger, 8, "Number of files in level-0" +DEFINE_int32(level0_slowdown_writes_trigger, + rocksdb::Options().level0_slowdown_writes_trigger, + "Number of files in level-0" " that will slow down writes."); -DEFINE_int32(level0_file_num_compaction_trigger, 4, "Number of files in level-0" +DEFINE_int32(level0_file_num_compaction_trigger, + rocksdb::Options().level0_file_num_compaction_trigger, + "Number of files in level-0" " when compactions start"); static bool ValidateInt32Percent(const char* flagname, int32_t value) { diff --git a/db/version_set.cc b/db/version_set.cc index 9881c3edc..3987fcf91 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -1019,13 +1019,6 @@ void VersionStorageInfo::ComputeCompactionScore( if (compaction_style_ == kCompactionStyleFIFO) { score = static_cast(total_size) / compaction_options_fifo.max_table_files_size; - } else if (num_sorted_runs >= - mutable_cf_options.level0_stop_writes_trigger) { - // If we are slowing down writes, then we better compact that first - score = 1000000; - } else if (num_sorted_runs >= - mutable_cf_options.level0_slowdown_writes_trigger) { - score = 10000; } else { score = static_cast(num_sorted_runs) / mutable_cf_options.level0_file_num_compaction_trigger;