Skip to content

Commit 8b1ab20

Browse files
riversand963tabokie
authored andcommitted
Remove unused variable single_column_family_mode_ (facebook#10078)
Summary: This variable is actually not being used for anything meaningful, thus remove it. This can make facebook#7516 slightly simpler by reducing the amount of state that must be made lock-free. Pull Request resolved: facebook#10078 Test Plan: make check Reviewed By: ajkr Differential Revision: D36779817 Pulled By: riversand963 fbshipit-source-id: ffb0d9ad6149616917ae5e02bb28102cb90fc406 Signed-off-by: tabokie <[email protected]>
1 parent ee97291 commit 8b1ab20

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

db/db_impl/db_impl.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2782,7 +2782,6 @@ Status DBImpl::CreateColumnFamilyImpl(const ColumnFamilyOptions& cf_options,
27822782
s = cfd->AddDirectories(&dummy_created_dirs);
27832783
}
27842784
if (s.ok()) {
2785-
single_column_family_mode_ = false;
27862785
auto* cfd =
27872786
versions_->GetColumnFamilySet()->GetColumnFamily(column_family_name);
27882787
assert(cfd != nullptr);

db/db_impl/db_impl.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,9 +1221,6 @@ class DBImpl : public DB {
12211221
// only used for dynamically adjusting max_total_wal_size. it is a sum of
12221222
// [write_buffer_size * max_write_buffer_number] over all column families
12231223
uint64_t max_total_in_memory_state_;
1224-
// If true, we have only one (default) column family. We use this to optimize
1225-
// some code-paths
1226-
bool single_column_family_mode_;
12271224

12281225
// The options to access storage files
12291226
const FileOptions file_options_;

db/db_impl/db_impl_open.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,6 @@ Status DBImpl::Recover(
557557
default_cf_handle_ = new ColumnFamilyHandleImpl(
558558
versions_->GetColumnFamilySet()->GetDefault(), this, &mutex_);
559559
default_cf_internal_stats_ = default_cf_handle_->cfd()->internal_stats();
560-
// TODO(Zhongyi): handle single_column_family_mode_ when
561-
// persistent_stats is enabled
562-
single_column_family_mode_ =
563-
versions_->GetColumnFamilySet()->NumberOfColumnFamilies() == 1;
564560

565561
// Recover from all newer log files than the ones named in the
566562
// descriptor (new log files may have been added by the previous

db/db_impl/db_impl_secondary.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ Status DBImplSecondary::Recover(
6161
default_cf_handle_ = new ColumnFamilyHandleImpl(
6262
versions_->GetColumnFamilySet()->GetDefault(), this, &mutex_);
6363
default_cf_internal_stats_ = default_cf_handle_->cfd()->internal_stats();
64-
single_column_family_mode_ =
65-
versions_->GetColumnFamilySet()->NumberOfColumnFamilies() == 1;
6664

6765
std::unordered_set<ColumnFamilyData*> cfds_changed;
6866
s = FindAndRecoverLogFiles(&cfds_changed, &job_context);

db/db_impl/db_impl_write.cc

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,12 +1249,18 @@ Status DBImpl::PreprocessWrite(const WriteOptions& write_options,
12491249

12501250
PERF_TIMER_GUARD(write_scheduling_flushes_compactions_time);
12511251

1252-
assert(!single_column_family_mode_ ||
1253-
versions_->GetColumnFamilySet()->NumberOfColumnFamilies() == 1);
1254-
if (UNLIKELY(status.ok() && !single_column_family_mode_ &&
1255-
total_log_size_ > GetMaxTotalWalSize())) {
1256-
WaitForPendingWrites();
1257-
status = SwitchWAL(write_context);
1252+
if (UNLIKELY(status.ok() && total_log_size_ > GetMaxTotalWalSize())) {
1253+
assert(versions_);
1254+
const ColumnFamilySet* const column_families =
1255+
versions_->GetColumnFamilySet();
1256+
assert(column_families);
1257+
size_t num_cfs = column_families->NumberOfColumnFamilies();
1258+
1259+
assert(num_cfs >= 1);
1260+
if (num_cfs > 1) {
1261+
WaitForPendingWrites();
1262+
status = SwitchWAL(write_context);
1263+
}
12581264
}
12591265

12601266
if (UNLIKELY(status.ok() && write_buffer_manager_->ShouldFlush())) {

0 commit comments

Comments
 (0)