From ec68091d19fc931b37a312388ac321f86dd7029f Mon Sep 17 00:00:00 2001 From: Yanqin Jin Date: Wed, 2 Jan 2019 09:56:39 -0800 Subject: [PATCH] Remove an unused parameter (#4816) Summary: The `flush_reason` parameter in `DBImpl::InstallSuperVersionAndScheduleWork` is not used. Remove it. Pull Request resolved: https://github.com/facebook/rocksdb/pull/4816 Differential Revision: D13543218 Pulled By: riversand963 fbshipit-source-id: 8fc75d49462ce092e85aef0fe0c50936140db153 --- db/db_impl.cc | 15 +++++----- db/db_impl.h | 3 +- db/db_impl_compaction_flush.cc | 52 ++++++++++++++++------------------ 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/db/db_impl.cc b/db/db_impl.cc index 8502e47b7..e5e500450 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -2389,9 +2389,9 @@ Status DBImpl::DeleteFile(std::string name) { status = versions_->LogAndApply(cfd, *cfd->GetLatestMutableCFOptions(), &edit, &mutex_, directories_.GetDbDir()); if (status.ok()) { - InstallSuperVersionAndScheduleWork( - cfd, &job_context.superversion_contexts[0], - *cfd->GetLatestMutableCFOptions(), FlushReason::kDeleteFiles); + InstallSuperVersionAndScheduleWork(cfd, + &job_context.superversion_contexts[0], + *cfd->GetLatestMutableCFOptions()); } FindObsoleteFiles(&job_context, false); } // lock released here @@ -2474,9 +2474,9 @@ Status DBImpl::DeleteFilesInRanges(ColumnFamilyHandle* column_family, status = versions_->LogAndApply(cfd, *cfd->GetLatestMutableCFOptions(), &edit, &mutex_, directories_.GetDbDir()); if (status.ok()) { - InstallSuperVersionAndScheduleWork( - cfd, &job_context.superversion_contexts[0], - *cfd->GetLatestMutableCFOptions(), FlushReason::kDeleteFiles); + InstallSuperVersionAndScheduleWork(cfd, + &job_context.superversion_contexts[0], + *cfd->GetLatestMutableCFOptions()); } for (auto* deleted_file : deleted_files) { deleted_file->being_compacted = false; @@ -3172,8 +3172,7 @@ Status DBImpl::IngestExternalFile( &mutex_, directories_.GetDbDir()); } if (status.ok()) { - InstallSuperVersionAndScheduleWork(cfd, &sv_context, *mutable_cf_options, - FlushReason::kExternalFileIngestion); + InstallSuperVersionAndScheduleWork(cfd, &sv_context, *mutable_cf_options); } // Resume writes to the DB diff --git a/db/db_impl.h b/db/db_impl.h index da8de21eb..9a9794603 100644 --- a/db/db_impl.h +++ b/db/db_impl.h @@ -1541,8 +1541,7 @@ class DBImpl : public DB { // state needs flush or compaction. void InstallSuperVersionAndScheduleWork( ColumnFamilyData* cfd, SuperVersionContext* sv_context, - const MutableCFOptions& mutable_cf_options, - FlushReason flush_reason = FlushReason::kOthers); + const MutableCFOptions& mutable_cf_options); #ifndef ROCKSDB_LITE using DB::GetPropertiesOfAllTables; diff --git a/db/db_impl_compaction_flush.cc b/db/db_impl_compaction_flush.cc index fd99d5821..95f24d7f5 100644 --- a/db/db_impl_compaction_flush.cc +++ b/db/db_impl_compaction_flush.cc @@ -60,7 +60,7 @@ bool DBImpl::EnoughRoomForCompaction( return enough_room; } -bool DBImpl::RequestCompactionToken(ColumnFamilyData* cfd, bool force, +bool DBImpl::RequestCompactionToken(ColumnFamilyData* cfd, bool force, std::unique_ptr* token, LogBuffer* log_buffer) { assert(*token == nullptr); @@ -72,10 +72,10 @@ bool DBImpl::RequestCompactionToken(ColumnFamilyData* cfd, bool force, *token = limiter->GetToken(force); if (*token != nullptr) { ROCKS_LOG_BUFFER(log_buffer, - "Thread limiter [%s] increase [%s] compaction task, " - "force: %s, tasks after: %d", - limiter->GetName().c_str(), cfd->GetName().c_str(), - force ? "true" : "false", limiter->GetOutstandingTask()); + "Thread limiter [%s] increase [%s] compaction task, " + "force: %s, tasks after: %d", + limiter->GetName().c_str(), cfd->GetName().c_str(), + force ? "true" : "false", limiter->GetOutstandingTask()); return true; } return false; @@ -948,9 +948,9 @@ Status DBImpl::CompactFilesImpl( Status status = compaction_job.Install(*c->mutable_cf_options()); if (status.ok()) { - InstallSuperVersionAndScheduleWork( - c->column_family_data(), &job_context->superversion_contexts[0], - *c->mutable_cf_options(), FlushReason::kManualCompaction); + InstallSuperVersionAndScheduleWork(c->column_family_data(), + &job_context->superversion_contexts[0], + *c->mutable_cf_options()); } c->ReleaseCompactionFiles(s); #ifndef ROCKSDB_LITE @@ -1406,11 +1406,10 @@ Status DBImpl::RunManualCompaction(ColumnFamilyData* cfd, int input_level, ca->prepicked_compaction = new PrepickedCompaction; ca->prepicked_compaction->manual_compaction_state = &manual; ca->prepicked_compaction->compaction = compaction; - if (!RequestCompactionToken(cfd, true, - &ca->prepicked_compaction->task_token, - &log_buffer)) { - // Don't throttle manual compaction, only count outstanding tasks. - assert(false); + if (!RequestCompactionToken( + cfd, true, &ca->prepicked_compaction->task_token, &log_buffer)) { + // Don't throttle manual compaction, only count outstanding tasks. + assert(false); } manual.incomplete = false; bg_compaction_scheduled_++; @@ -1874,8 +1873,8 @@ ColumnFamilyData* DBImpl::PickCompactionFromQueue( break; } // Add throttled compaction candidates back to queue in the original order. - for (auto iter = throttled_candidates.rbegin(); - iter != throttled_candidates.rend(); ++iter) { + for (auto iter = throttled_candidates.rbegin(); + iter != throttled_candidates.rend(); ++iter) { compaction_queue_.push_front(*iter); } return cfd; @@ -2435,9 +2434,9 @@ Status DBImpl::BackgroundCompaction(bool* made_progress, status = versions_->LogAndApply(c->column_family_data(), *c->mutable_cf_options(), c->edit(), &mutex_, directories_.GetDbDir()); - InstallSuperVersionAndScheduleWork( - c->column_family_data(), &job_context->superversion_contexts[0], - *c->mutable_cf_options(), FlushReason::kAutoCompaction); + InstallSuperVersionAndScheduleWork(c->column_family_data(), + &job_context->superversion_contexts[0], + *c->mutable_cf_options()); ROCKS_LOG_BUFFER(log_buffer, "[%s] Deleted %d files\n", c->column_family_data()->GetName().c_str(), c->num_input_files(0)); @@ -2489,9 +2488,9 @@ Status DBImpl::BackgroundCompaction(bool* made_progress, *c->mutable_cf_options(), c->edit(), &mutex_, directories_.GetDbDir()); // Use latest MutableCFOptions - InstallSuperVersionAndScheduleWork( - c->column_family_data(), &job_context->superversion_contexts[0], - *c->mutable_cf_options(), FlushReason::kAutoCompaction); + InstallSuperVersionAndScheduleWork(c->column_family_data(), + &job_context->superversion_contexts[0], + *c->mutable_cf_options()); VersionStorageInfo::LevelSummaryStorage tmp; c->column_family_data()->internal_stats()->IncBytesMoved(c->output_level(), @@ -2575,9 +2574,9 @@ Status DBImpl::BackgroundCompaction(bool* made_progress, status = compaction_job.Install(*c->mutable_cf_options()); if (status.ok()) { - InstallSuperVersionAndScheduleWork( - c->column_family_data(), &job_context->superversion_contexts[0], - *c->mutable_cf_options(), FlushReason::kAutoCompaction); + InstallSuperVersionAndScheduleWork(c->column_family_data(), + &job_context->superversion_contexts[0], + *c->mutable_cf_options()); } *made_progress = true; TEST_SYNC_POINT_CALLBACK("DBImpl::BackgroundCompaction:AfterCompaction", @@ -2815,10 +2814,7 @@ void DBImpl::BuildCompactionJobInfo( void DBImpl::InstallSuperVersionAndScheduleWork( ColumnFamilyData* cfd, SuperVersionContext* sv_context, - const MutableCFOptions& mutable_cf_options, - FlushReason /* flush_reason */) { - // TODO(yanqin) investigate if 'flush_reason' can be removed since it's not - // used. + const MutableCFOptions& mutable_cf_options) { mutex_.AssertHeld(); // Update max_total_in_memory_state_