delete flushsubdb

OpenAtomFoundation · Mar 25, 2024 · ac8e1dc · ac8e1dc
1 parent 1cd069f
commit ac8e1dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 43 deletions.
diff --git a/include/pika_db.h b/include/pika_db.h
@@ -139,12 +139,9 @@ class DB : public std::enable_shared_from_this<DB>, public pstd::noncopyable {
   void Init();
   bool TryUpdateMasterOffset();
   /*
-   * FlushDB & FlushSubDB use
+   * FlushDB used
    */
-  bool FlushDB();
-  bool FlushSubDB(const std::string& db_name);
   bool FlushDBWithoutLock();
-  bool FlushSubDBWithoutLock(const std::string& db_name);
   bool ChangeDb(const std::string& new_path);
   pstd::Status GetBgSaveUUID(std::string* snapshot_uuid);
   void PrepareRsync();

diff --git a/src/pika_admin.cc b/src/pika_admin.cc
@@ -526,6 +526,7 @@ void FlushallCmd::DoInitial() {
     return;
   }
 }
+
 void FlushallCmd::Do() {
   std::lock_guard l_trw(g_pika_server->GetDBLock());
   for (const auto& db_item : g_pika_server->GetDB()) {

diff --git a/src/pika_db.cc b/src/pika_db.cc
@@ -201,6 +201,7 @@ DisplayCacheInfo DB::GetCacheInfo() {
 }
 
 bool DB::FlushDBWithoutLock() {
+  std::lock_guard l(bgsave_protector_);
   if (bgsave_info_.bgsaving) {
     return false;
   }
@@ -225,34 +226,6 @@ bool DB::FlushDBWithoutLock() {
   return true;
 }
 
-bool DB::FlushSubDBWithoutLock(const std::string& db_name) {
-  std::lock_guard l(bgsave_protector_);
-  if (bgsave_info_.bgsaving) {
-    return false;
-  }
-
-  LOG(INFO) << db_name_ << " Delete old " + db_name + " db...";
-  storage_.reset();
-
-  std::string dbpath = db_path_;
-  if (dbpath[dbpath.length() - 1] != '/') {
-    dbpath.append("/");
-  }
-
-  std::string sub_dbpath = dbpath + db_name;
-  std::string del_dbpath = dbpath + db_name + "_deleting";
-  pstd::RenameFile(sub_dbpath, del_dbpath);
-
-  storage_ = std::make_shared<storage::Storage>(g_pika_conf->db_instance_num(),
-      g_pika_conf->default_slot_num(), g_pika_conf->classic_mode());
-  rocksdb::Status s = storage_->Open(g_pika_server->storage_options(), db_path_);
-  assert(storage_);
-  assert(s.ok());
-  LOG(INFO) << db_name_ << " open new " + db_name + " db success";
-  g_pika_server->PurgeDir(del_dbpath);
-  return true;
-}
-
 void DB::DoBgSave(void* arg) {
   std::unique_ptr<BgTaskArg> bg_task_arg(static_cast<BgTaskArg*>(arg));
 
@@ -575,11 +548,6 @@ void DB::ClearBgsave() {
   bgsave_info_.Clear();
 }
 
-bool DB::FlushSubDB(const std::string& db_name) {
-  std::lock_guard rwl(dbs_rw_);
-  return FlushSubDBWithoutLock(db_name);
-}
-
 void DB::UpdateCacheInfo(CacheInfo& cache_info) {
   std::unique_lock<std::shared_mutex> lock(cache_info_rwlock_);
 
@@ -628,9 +596,3 @@ void DB::ResetDisplayCacheInfo(int status) {
   cache_info_.waitting_load_keys_num = 0;
   cache_usage_ = 0;
 }
-
-bool DB::FlushDB() {
-  std::lock_guard rwl(dbs_rw_);
-  std::lock_guard l(bgsave_protector_);
-  return FlushDBWithoutLock();
-}