Address comment

Author: hx235

db/compaction/compaction_job.cc

@@ -192,11 +192,9 @@ CompactionJob::CompactionJob(
   assert(log_buffer_ != nullptr);
 
   const auto* cfd = compact_->compaction->column_family_data();
-  if (cfd) {
-    ThreadStatusUtil::SetEnableTracking(db_options_.enable_thread_tracking);
-    ThreadStatusUtil::SetColumnFamily(cfd, cfd->ioptions()->env);
-    ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_COMPACTION);
-  }
+  ThreadStatusUtil::SetEnableTracking(db_options_.enable_thread_tracking);
+  ThreadStatusUtil::SetColumnFamily(cfd);
+  ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_COMPACTION);
   ReportStartedCompaction(compaction);
 }
 
@@ -206,19 +204,13 @@ CompactionJob::~CompactionJob() {
 }
 
 void CompactionJob::ReportStartedCompaction(Compaction* compaction) {
-  const auto* cfd = compact_->compaction->column_family_data();
-  if (cfd) {
-    ThreadStatusUtil::SetEnableTracking(db_options_.enable_thread_tracking);
-    ThreadStatusUtil::SetColumnFamily(cfd, cfd->ioptions()->env);
+  ThreadStatusUtil::SetThreadOperationProperty(ThreadStatus::COMPACTION_JOB_ID,
+                                               job_id_);
 
-    ThreadStatusUtil::SetThreadOperationProperty(
-        ThreadStatus::COMPACTION_JOB_ID, job_id_);
-
-    ThreadStatusUtil::SetThreadOperationProperty(
-        ThreadStatus::COMPACTION_INPUT_OUTPUT_LEVEL,
-        (static_cast<uint64_t>(compact_->compaction->start_level()) << 32) +
-            compact_->compaction->output_level());
-  }
+  ThreadStatusUtil::SetThreadOperationProperty(
+      ThreadStatus::COMPACTION_INPUT_OUTPUT_LEVEL,
+      (static_cast<uint64_t>(compact_->compaction->start_level()) << 32) +
+          compact_->compaction->output_level());
 
   // In the current design, a CompactionJob is always created
   // for non-trivial compaction.

db/db_impl/db_impl_compaction_flush.cc

@@ -3432,11 +3432,8 @@ Status DBImpl::BackgroundCompaction(bool* made_progress,
                              c->column_family_data());
     // Instrument for event update
     // TODO(yhchiang): add op details for showing trivial-move.
-    if (c->column_family_data()) {
-      ThreadStatusUtil::SetColumnFamily(
-          c->column_family_data(), c->column_family_data()->ioptions()->env);
-      ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_COMPACTION);
-    }
+    ThreadStatusUtil::SetColumnFamily(c->column_family_data());
+    ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_COMPACTION);
 
     compaction_job_stats.num_input_files = c->num_input_files(0);
 

db/flush_job.cc

@@ -141,13 +141,11 @@ FlushJob::FlushJob(
 FlushJob::~FlushJob() { ThreadStatusUtil::ResetThreadStatus(); }
 
 void FlushJob::ReportStartedFlush() {
-  if (cfd_) {
-    ThreadStatusUtil::SetEnableTracking(db_options_.enable_thread_tracking);
-    ThreadStatusUtil::SetColumnFamily(cfd_, cfd_->ioptions()->env);
-    ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_FLUSH);
-    ThreadStatusUtil::SetThreadOperationProperty(
-        ThreadStatus::COMPACTION_JOB_ID, job_context_->job_id);
-  }
+  ThreadStatusUtil::SetEnableTracking(db_options_.enable_thread_tracking);
+  ThreadStatusUtil::SetColumnFamily(cfd_);
+  ThreadStatusUtil::SetThreadOperation(ThreadStatus::OP_FLUSH);
+  ThreadStatusUtil::SetThreadOperationProperty(ThreadStatus::COMPACTION_JOB_ID,
+                                               job_context_->job_id);
 
   IOSTATS_RESET(bytes_written);
 }

monitoring/thread_status_util.cc

@@ -40,19 +40,16 @@ void ThreadStatusUtil::SetEnableTracking(bool enable_tracking) {
   thread_updater_local_cache_->SetEnableTracking(enable_tracking);
 }
 
-void ThreadStatusUtil::SetColumnFamily(const ColumnFamilyData* cfd,
-                                       const Env* env) {
-  if (!MaybeInitThreadLocalUpdater(env)) {
+void ThreadStatusUtil::SetColumnFamily(const ColumnFamilyData* cfd) {
+  if (thread_updater_local_cache_ == nullptr) {
     return;
   }
-  assert(thread_updater_local_cache_ && cfd);
+  assert(cfd);
   thread_updater_local_cache_->SetColumnFamilyInfoKey(cfd);
 }
 
 void ThreadStatusUtil::SetThreadOperation(ThreadStatus::OperationType op) {
   if (thread_updater_local_cache_ == nullptr) {
-    // thread_updater_local_cache_ must be set in SetColumnFamily
-    // or other ThreadStatusUtil functions.
     return;
   }
 
@@ -178,8 +175,7 @@ bool ThreadStatusUtil::MaybeInitThreadLocalUpdater(const Env* /*env*/) {
   return false;
 }
 
-void ThreadStatusUtil::SetColumnFamily(const ColumnFamilyData* /*cfd*/,
-                                       const Env* /*env*/) {}
+void ThreadStatusUtil::SetColumnFamily(const ColumnFamilyData* /*cfd*/) {}
 
 void ThreadStatusUtil::SetThreadOperation(ThreadStatus::OperationType /*op*/) {}
 
@@ -194,7 +190,7 @@ void ThreadStatusUtil::SetThreadState(ThreadStatus::StateType /*state*/) {}
 void ThreadStatusUtil::NewColumnFamilyInfo(const DB* /*db*/,
                                            const ColumnFamilyData* /*cfd*/,
                                            const std::string& /*cf_name*/,
-                                           const Env* /*env*/) {}
+                                           const Env* env) {}
 
 void ThreadStatusUtil::EraseColumnFamilyInfo(const ColumnFamilyData* /*cfd*/) {}
 

monitoring/thread_status_util.h

@@ -58,7 +58,7 @@ class ThreadStatusUtil {
   // something related to the specified column family.
   //
   // REQUIRES: cfd != nullptr
-  static void SetColumnFamily(const ColumnFamilyData* cfd, const Env* env);
+  static void SetColumnFamily(const ColumnFamilyData* cfd);
 
   static void SetThreadOperation(ThreadStatus::OperationType type);