fix build

Author: xingbowang

db/compaction/compaction_job.cc

@@ -1593,7 +1593,6 @@ Status CompactionJob::ProcessKeyValue(
     SubcompactionState* sub_compact, ColumnFamilyData* cfd,
     CompactionIterator* c_iter, const CompactionFileOpenFunc& open_file_func,
     const CompactionFileCloseFunc& close_file_func, uint64_t& prev_cpu_micros) {
-  Status status;
   // Unified cron interval for periodic operations: stats update, abort check,
   // and sync points. Uses 1000 to maintain responsive abort checking.
   const uint64_t kCronEvery = 1000;
@@ -1604,6 +1603,7 @@ Status CompactionJob::ProcessKeyValue(
     return Status::Incomplete(Status::SubCode::kCompactionAborted);
   }
 
+  Status status;
   IterKey prev_iter_output_key;
   ParsedInternalKey prev_iter_output_internal_key;
 

db/db_compaction_abort_test.cc

@@ -614,62 +614,6 @@ TEST_F(DBCompactionAbortTest, AbortCompactFilesAPI) {
   VerifyDataIntegrity(/*num_keys=*/100);
 }
 
-TEST_F(DBCompactionAbortTest, AbortWithMultipleColumnFamilies) {
-  // Test that AbortAllCompactions affects all column families
-  Options options = CurrentOptions();
-  options.level0_file_num_compaction_trigger = 4;
-  options.max_subcompactions = 2;
-  options.disable_auto_compactions = true;
-
-  CreateAndReopenWithCF({"cf1", "cf2"}, options);
-
-  Random rnd(301);
-
-  // Write to all column families
-  for (int cf = 0; cf < 3; ++cf) {
-    for (int i = 0; i < 4; ++i) {
-      for (int j = 0; j < 100; ++j) {
-        ASSERT_OK(Put(cf, Key(j), rnd.RandomString(500)));
-      }
-      ASSERT_OK(Flush(cf));
-    }
-  }
-
-  AbortSynchronizer abort_sync;
-
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "CompactionJob::ProcessKeyValueCompaction:Start",
-      [&](void* /*arg*/) { abort_sync.TriggerAbort(dbfull()); });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  // Try to compact all column families
-  CompactRangeOptions cro;
-  for (int cf = 0; cf < 3; ++cf) {
-    Status s = dbfull()->CompactRange(cro, handles_[cf], nullptr, nullptr);
-    ASSERT_TRUE(s.IsIncomplete());
-    ASSERT_TRUE(s.IsCompactionAborted());
-  }
-
-  CleanupSyncPoints();
-
-  abort_sync.WaitForAbortCompletion();
-  dbfull()->ResumeAllCompactions();
-
-  // Compaction should work after resume for all CFs
-  for (int cf = 0; cf < 3; ++cf) {
-    ASSERT_OK(dbfull()->CompactRange(cro, handles_[cf], nullptr, nullptr));
-  }
-
-  // Verify data integrity for all CFs
-  std::string val;
-  for (int cf = 0; cf < 3; ++cf) {
-    for (int j = 0; j < 100; ++j) {
-      val = Get(cf, Key(j));
-      ASSERT_FALSE(val.empty());
-    }
-  }
-}
-
 TEST_F(DBCompactionAbortTest, AbortDoesNotAffectFlush) {
   // Test that AbortAllCompactions does not affect flush operations
   Options options = CurrentOptions();
@@ -818,7 +762,7 @@ TEST_F(DBCompactionAbortTest, AbortWithInProgressFileCleanup) {
         if (pos != std::string::npos) {
           fname = fname.substr(pos + 1);
         }
-        if (sscanf(fname.c_str(), "%lu", &file_num) == 1) {
+        if (sscanf(fname.c_str(), "%" PRIu64, &file_num) == 1) {
           sst_file_numbers.push_back(file_num);
         }
       }