fix conflict

OpenAtomFoundation · Jan 23, 2024 · c5d7b96 · c5d7b96
1 parent 733bcf2
commit c5d7b96
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/pika.yml b/.github/workflows/pika.yml
@@ -174,7 +174,7 @@ jobs:
       - name: Install Deps
         run: |
           brew update
-          brew install --overwrite python autoconf protobuf llvm wget git
+          brew install --overwrite autoconf protobuf llvm wget git
           brew install gcc@10 automake cmake make binutils
 
       - name: Configure CMake

diff --git a/include/pika_conf.h b/include/pika_conf.h
@@ -630,6 +630,7 @@ class PikaConf : public pstd::BaseConf {
   }
 
   const std::string scache_type() {
+    std::lock_guard l(rwlock_);
     return pstd::StringConcat(cache_type_, COMMA);
   }
 

diff --git a/src/pika_admin.cc b/src/pika_admin.cc
@@ -3127,7 +3127,7 @@ void DisableWalCmd::Do() {
 }
 
 void CacheCmd::DoInitial() {
-  if (!CheckArg(argv_.size()) || argv_.size() < 2) {
+  if (!CheckArg(argv_.size()) || (argv_.size() > 3)) {
     res_.SetRes(CmdRes::kWrongNum, kCmdNameCache);
     return;
   }

diff --git a/src/pika_command.cc b/src/pika_command.cc
@@ -855,7 +855,6 @@ void Cmd::Execute() {
 }
 
 void Cmd::ProcessCommand(const HintKeys& hint_keys) {
-  LOG(INFO) << "lmz";
   if (stage_ == kNone) {
     InternalProcessCommand(hint_keys);
   } else {
@@ -868,7 +867,6 @@ void Cmd::ProcessCommand(const HintKeys& hint_keys) {
 }
 
 void Cmd::InternalProcessCommand(const HintKeys& hint_keys) {
-  LOG(INFO) << db_->GetDBName();
   pstd::lock::MultiRecordLock record_lock(db_->LockMgr());
   if (is_write()) {
     record_lock.Lock(current_key());

diff --git a/src/pika_conf.cc b/src/pika_conf.cc
@@ -617,7 +617,7 @@ void PikaConf::SetCacheType(const std::string& value) {
 
 int PikaConf::ConfigRewrite() {
   //  std::string userblacklist = suser_blacklist();
-
+  SetConfStr("cache-type", scache_type());
   std::lock_guard l(rwlock_);
   // Only set value for config item that can be config set.
   SetConfInt("timeout", timeout_);
@@ -669,7 +669,6 @@ int PikaConf::ConfigRewrite() {
   SetConfStr("share-block-cache", share_block_cache_ ? "yes" : "no");
   SetConfInt("block-size", block_size_);
   SetConfInt("block-cache", block_cache_);
-  SetConfStr("cache-type", scache_type());
   SetConfStr("cache-index-and-filter-blocks", cache_index_and_filter_blocks_ ? "yes" : "no");
   SetConfInt("cache-model", cache_model_);
   SetConfInt("zset_cache_start_pos", zset_cache_start_pos_);

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -1741,7 +1741,7 @@ void PikaServer::ResetCacheAsync(uint32_t cache_num, std::shared_ptr<DB> db, cac
   }
 }
 
-void PikaServer::ClearCacheDbAsync(std::shared_ptr<Slot> slot) {
+void PikaServer::ClearCacheDbAsync(std::shared_ptr<DB> db) {
   // disable cache temporarily, and restore it after cache cleared
   g_pika_conf->SetCacheDisableFlag();
   if (PIKA_CACHE_STATUS_OK != db->cache()->CacheStatus()) {
@@ -1808,7 +1808,7 @@ void PikaServer::ClearHitRatio(std::shared_ptr<DB> db) {
   db->cache()->ClearHitRatio();
 }
 
-void PikaServer::OnCacheStartPosChanged(int zset_cache_start_pos, std::shared_ptr<Slot> slot) {
+void PikaServer::OnCacheStartPosChanged(int zset_cache_start_pos, std::shared_ptr<DB> db) {
   ResetCacheConfig(db);
   ClearCacheDbAsync(db);
 }
@@ -1823,6 +1823,7 @@ void PikaServer::ClearCacheDbAsyncV2(std::shared_ptr<DB> db) {
   BGCacheTaskArg *arg = new BGCacheTaskArg();
   arg->db = db;
   arg->task_type = CACHE_BGTASK_CLEAR;
+  arg->conf = std::move(g_pika_conf);
   arg->reenable_cache = true;
   common_bg_thread_.Schedule(&DoCacheBGTask, static_cast<void*>(arg));
 }