fix

chejinge · Nov 27, 2023 · c1fcb13 · c1fcb13
1 parent 55edfd5
commit c1fcb13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/include/pika_slot.h b/include/pika_slot.h
@@ -127,17 +127,12 @@ class Slot : public std::enable_shared_from_this<Slot>,public pstd::noncopyable
   pstd::Status GetKeyNum(std::vector<storage::KeyInfo>* key_info);
   KeyScanInfo GetKeyScanInfo();
 
-  /*
-   * SlotsMgrt used
-   */
-  void GetSlotsMgrtSenderStatus(std::string *ip, int64_t *port, int64_t *slot, bool *migrating, int64_t *moved, int64_t *remained);
   /*
    * Cache used
    */
   DisplayCacheInfo GetCacheInfo();
   void UpdateCacheInfo(CacheInfo& cache_info);
   void ResetDisplayCacheInfo(int status);
-  uint64_t GetCacheUsage() {return cache_usage_;}
   uint64_t cache_usage_;
 
  private:
@@ -181,7 +176,6 @@ class Slot : public std::enable_shared_from_this<Slot>,public pstd::noncopyable
   /*
    * Cache used
    */
-  pstd::Mutex cache_info_protector_;
   DisplayCacheInfo cache_info_;
   std::shared_mutex cache_info_rwlock_;
 };

diff --git a/src/pika_slot.cc b/src/pika_slot.cc
@@ -107,15 +107,11 @@ std::shared_ptr<storage::Storage> Slot::db() const { return db_; }
 std::shared_ptr<PikaCache> Slot::cache() const { return cache_; }
 
 void Slot::Init() {
-  auto cache = std::make_shared<PikaCache>(g_pika_conf->zset_cache_start_pos(), g_pika_conf->zset_cache_field_num_per_key(), shared_from_this());
+  cache_ = std::make_shared<PikaCache>(g_pika_conf->zset_cache_start_pos(), g_pika_conf->zset_cache_field_num_per_key(), shared_from_this());
   // Create cache
   cache::CacheConfig cache_cfg;
   g_pika_server->CacheConfigInit(cache_cfg);
-  rocksdb::Status ret = cache->Init(g_pika_conf->GetCacheNum(), &cache_cfg);
-  assert(cache_);
-  assert(ret.ok());
-  LOG(INFO) << "Cache Success";
-  cache_ = std::move(cache);
+  cache_->Init(g_pika_conf->GetCacheNum(), &cache_cfg);
 }
 
 void Slot::Compact(const storage::DataType& type) {