process compact

Author: brother-jin

include/pika_conf.h

@@ -357,12 +357,12 @@ class PikaConf : public pstd::BaseConf {
 
   bool enable_progressive_compact() {
     std::shared_lock l(rwlock_);
-    return enable_progressive_compact_;
+    return enable_auto_compact_old_sst_;
   }
 
   int progressive_compact_interval() {
     std::shared_lock l(rwlock_);
-    return progressive_compact_interval_;
+    return auto_compact_old_sst_interval_;
   }
 
   bool enable_auto_compact_old_sst() {
@@ -1088,7 +1088,7 @@ class PikaConf : public pstd::BaseConf {
   std::string blob_compression_type_ = "none";
 
   std::unique_ptr<PikaMeta> local_meta_;
-  std::shared_mutex rwlock_;
+  mutable std::shared_mutex rwlock_;
 
   // Rsync Rate limiting configuration
   int throttle_bytes_per_second_ = 200 << 20; // 200MB/s

src/pika_conf.cc

@@ -446,17 +446,19 @@ int PikaConf::Load() {
   }
 
   // Progressive compact configuration
-  enable_progressive_compact_ = false;  // 默认关闭
+  enable_auto_compact_old_sst_ = false;  // 默认关闭
   std::string enable_pc;
   GetConfStr("enable-progressive-compact", &enable_pc);
   if (enable_pc == "yes") {
-    enable_progressive_compact_ = true;
+    enable_auto_compact_old_sst_ = true;
   }
 
-  progressive_compact_interval_ = 90;  // 默认90秒
-  GetConfInt("progressive-compact-interval", &progressive_compact_interval_);
-  if (progressive_compact_interval_ < 1) {
-    progressive_compact_interval_ = 90;
+  auto_compact_old_sst_interval_ = 90;  // 默认90秒
+  int interval;
+  GetConfInt("progressive-compact-interval", &interval);
+  auto_compact_old_sst_interval_ = interval;
+  if (auto_compact_old_sst_interval_ < 1) {
+    auto_compact_old_sst_interval_ = 90;
   }
 
   GetConfInt("max-background-flushes", &max_background_flushes_);

src/storage/src/redis.cc

@@ -5,7 +5,7 @@
 
 #include "src/redis.h"
 #include <sstream>
-#include "rocksdb/column_family.h"
+#include "rocksdb/db.h"
 #include "rocksdb/compaction_job_stats.h"
 #include "glog/logging.h"  // 确保LOG宏可用