Use multi-level indexes by default

Summary: Use multi-level indexes by default Test Plan: Jenkins Reviewers: mikhail Reviewed By: mikhail Subscribers: ybase Differential Revision: https://phabricator.dev.yugabyte.com/D4263
yugabyte · Mar 5, 2018 · 702d528 · 702d528
1 parent 72ffc21
commit 702d528
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 16 deletions.
diff --git a/bin/local_cluster_ctl.sh b/bin/local_cluster_ctl.sh
@@ -563,7 +563,6 @@ if [[ -n "$tserver_db_block_cache_size_bytes" ]]; then
   tserver_optional_params+=" --db_block_cache_size_bytes $tserver_db_block_cache_size_bytes"
 fi
 tserver_optional_params+=" --use_cassandra_authentication=$use_cassandra_authentication"
-tserver_optional_params+=" --use_multi_level_index"
 
 master_binary="$build_root/bin/yb-master"
 ensure_binary_exists "$master_binary"

diff --git a/src/yb/docdb/docdb_rocksdb_util.cc b/src/yb/docdb/docdb_rocksdb_util.cc
@@ -75,10 +75,7 @@ DEFINE_bool(use_docdb_aware_bloom_filter, true,
 DEFINE_int32(max_nexts_to_avoid_seek, 1,
              "The number of next calls to try before doing resorting to do a rocksdb seek.");
 DEFINE_bool(trace_docdb_calls, false, "Whether we should trace calls into the docdb.");
-// TODO(mli) - switch to true once it is safe (necessary installations are upgraded to a build which
-// supports multi-level index). Also update other places in tests where it is set to true
-// explicitly.
-DEFINE_bool(use_multi_level_index, false, "Whether to use multi-level data index.");
+DEFINE_bool(use_multi_level_index, true, "Whether to use multi-level data index.");
 
 DEFINE_uint64(initial_seqno, 1ULL << 50, "Initial seqno for new RocksDB instances.");
 

diff --git a/src/yb/docdb/docdb_test_base.cc b/src/yb/docdb/docdb_test_base.cc
@@ -16,8 +16,6 @@
 #include "yb/docdb/docdb.h"
 #include "yb/docdb/docdb_test_util.h"
 
-DECLARE_bool(use_multi_level_index);
-
 namespace yb {
 namespace docdb {
 
@@ -29,7 +27,6 @@ DocDBTestBase::~DocDBTestBase() {
 
 void DocDBTestBase::SetUp() {
   YBTest::SetUp();
-  FLAGS_use_multi_level_index = true;
   ASSERT_OK(InitRocksDBOptions());
   ASSERT_OK(InitRocksDBDir());
   ASSERT_OK(OpenRocksDB());

diff --git a/src/yb/docdb/docdb_test_util.cc b/src/yb/docdb/docdb_test_util.cc
@@ -50,8 +50,6 @@ using strings::Substitute;
 using yb::util::ApplyEagerLineContinuation;
 using yb::util::FormatBytesAsStr;
 
-DECLARE_bool(use_multi_level_index);
-
 namespace yb {
 namespace docdb {
 
@@ -599,7 +597,6 @@ string DocDBRocksDBFixture::tablet_id() {
 }
 
 Status DocDBRocksDBFixture::InitRocksDBOptions() {
-  FLAGS_use_multi_level_index = true;
   return InitCommonRocksDBOptions();
 }
 

diff --git a/src/yb/integration-tests/external_mini_cluster.cc b/src/yb/integration-tests/external_mini_cluster.cc
@@ -119,7 +119,6 @@ DECLARE_string(vmodule);
 DECLARE_int32(replication_factor);
 DECLARE_bool(mem_tracker_logging);
 DECLARE_bool(mem_tracker_log_stack_trace);
-DECLARE_bool(use_multi_level_index);
 
 DEFINE_string(external_daemon_heap_profile_prefix, "",
               "If this is not empty, tcmalloc's HEAPPROFILE is set this, followed by a unique "
@@ -164,7 +163,6 @@ ExternalMiniCluster::ExternalMiniCluster(const ExternalMiniClusterOptions& opts)
   // These "extra mini cluster options" are added in the end of the command line.
   const auto common_extra_flags = {
       "--enable_tracing"s,
-      "--use_multi_level_index"s,
       Substitute("--memory_limit_hard_bytes=$0", kDefaultMemoryLimitHardBytes)
   };
   for (auto* extra_flags : {&opts_.extra_master_flags, &opts_.extra_tserver_flags}) {

diff --git a/src/yb/integration-tests/mini_cluster.cc b/src/yb/integration-tests/mini_cluster.cc
@@ -67,7 +67,6 @@ DECLARE_int32(ts_admin_svc_num_threads);
 DECLARE_int32(ts_consensus_svc_num_threads);
 DECLARE_int32(ts_remote_bootstrap_svc_num_threads);
 DECLARE_int32(replication_factor);
-DECLARE_bool(use_multi_level_index);
 
 namespace yb {
 
@@ -145,8 +144,6 @@ Status MiniCluster::Start(const std::vector<tserver::TabletServerOptions>& extra
   FLAGS_replication_factor = num_masters_initial_;
   FLAGS_memstore_size_mb = 16;
 
-  FLAGS_use_multi_level_index = true;
-
   // start the masters
   RETURN_NOT_OK_PREPEND(StartMasters(),
                         "Couldn't start distributed masters");