Merge branch 'unstable' into feature/etc

OpenAtomFoundation · Aug 9, 2024 · ace2213 · ace2213
2 parents 0a511c0 + a72cd92
commit ace2213
Show file tree

Hide file tree

Showing 25 changed files with 429 additions and 374 deletions.
diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
diff --git a/src/base_cmd.cc b/src/base_cmd.cc
@@ -107,7 +107,7 @@ BaseCmd* BaseCmdGroup::GetSubCmd(const std::string& cmdName) {
 bool BaseCmdGroup::DoInitial(PClient* client) {
   client->SetSubCmdName(client->argv_[1]);
   if (!subCmds_.contains(client->SubCmdName())) {
-    client->SetRes(CmdRes::kSyntaxErr, client->argv_[0] + " unknown subcommand for '" + client->SubCmdName() + "'");
+    client->SetRes(CmdRes::kErrOther, client->argv_[0] + " unknown subcommand for '" + client->SubCmdName() + "'");
     return false;
   }
   return true;

diff --git a/src/client.h b/src/client.h
@@ -47,6 +47,8 @@ class CmdRes {
     kInvalidDB,
     kInconsistentHashTag,
     kErrOther,
+    kUnknownCmd,
+    kUnknownSubCmd,
     KIncrByOverFlow,
     kInvalidCursor,
     kWrongLeader,

diff --git a/src/cmd_keys.cc b/src/cmd_keys.cc
@@ -63,7 +63,7 @@ bool TypeCmd::DoInitial(PClient* client) {
 }
 
 void TypeCmd::DoCmd(PClient* client) {
-  storage::DataType type;
+  storage::DataType type = storage::DataType::kNones;
   rocksdb::Status s = PSTORE.GetBackend(client->GetCurrentDB())->GetStorage()->GetType(client->Key(), type);
   if (s.ok()) {
     client->AppendContent("+" + std::string(storage::DataTypeToString(type)));

diff --git a/src/cmd_kv.cc b/src/cmd_kv.cc
@@ -323,20 +323,18 @@ void BitOpCmd::DoCmd(PClient* client) {
   PString res;
   storage::BitOpType op = storage::kBitOpDefault;
 
-  if (keys.size() == 1) {
+  if (!keys.empty()) {
     if (pstd::StringEqualCaseInsensitive(client->argv_[1], "or")) {
       err = kPErrorOK;
       op = storage::kBitOpOr;
-    }
-  } else if (keys.size() >= 2) {
-    if (pstd::StringEqualCaseInsensitive(client->argv_[1], "xor")) {
+    } else if (pstd::StringEqualCaseInsensitive(client->argv_[1], "xor")) {
       err = kPErrorOK;
       op = storage::kBitOpXor;
     } else if (pstd::StringEqualCaseInsensitive(client->argv_[1], "and")) {
       err = kPErrorOK;
       op = storage::kBitOpAnd;
     } else if (pstd::StringEqualCaseInsensitive(client->argv_[1], "not")) {
-      if (client->argv_.size() == 4) {
+      if (keys.size() == 1) {
         err = kPErrorOK;
         op = storage::kBitOpNot;
       }

diff --git a/src/cmd_table_manager.cc b/src/cmd_table_manager.cc
@@ -17,6 +17,7 @@
 #include "cmd_raft.h"
 #include "cmd_set.h"
 #include "cmd_zset.h"
+#include "pstd_string.h"
 
 namespace pikiwidb {
 
@@ -190,16 +191,16 @@ std::pair<BaseCmd*, CmdRes::CmdRet> CmdTableManager::GetCommand(const std::strin
   auto cmd = cmds_->find(cmdName);
 
   if (cmd == cmds_->end()) {
-    return std::pair(nullptr, CmdRes::kSyntaxErr);
+    return std::pair(nullptr, CmdRes::kUnknownCmd);
   }
 
   if (cmd->second->HasSubCommand()) {
     if (client->argv_.size() < 2) {
       return std::pair(nullptr, CmdRes::kInvalidParameter);
     }
-    return std::pair(cmd->second->GetSubCmd(client->argv_[1]), CmdRes::kSyntaxErr);
+    return std::pair(cmd->second->GetSubCmd(pstd::StringToLower(client->argv_[1])), CmdRes::kUnknownSubCmd);
   }
-  return std::pair(cmd->second.get(), CmdRes::kSyntaxErr);
+  return std::pair(cmd->second.get(), CmdRes::kOK);
 }
 
 bool CmdTableManager::CmdExist(const std::string& cmd) const {

diff --git a/src/cmd_thread_pool_worker.cc b/src/cmd_thread_pool_worker.cc
@@ -21,10 +21,12 @@ void CmdWorkThreadPoolWorker::Work() {
       auto [cmdPtr, ret] = cmd_table_manager_.GetCommand(task->CmdName(), task->Client().get());
 
       if (!cmdPtr) {
-        if (ret == CmdRes::kInvalidParameter) {
-          task->Client()->SetRes(CmdRes::kInvalidParameter);
+        if (ret == CmdRes::kUnknownCmd) {
+          task->Client()->SetRes(CmdRes::kErrOther, "unknown command '" + task->CmdName() + "'");
+        } else if (ret == CmdRes::kUnknownSubCmd) {
+          task->Client()->SetRes(CmdRes::kErrOther, "unknown sub command '" + task->Client().get()->argv_[1] + "'");
         } else {
-          task->Client()->SetRes(CmdRes::kSyntaxErr, "unknown command '" + task->CmdName() + "'");
+          task->Client()->SetRes(CmdRes::kInvalidParameter);
         }
         g_pikiwidb->PushWriteTask(task->Client());
         continue;

diff --git a/src/storage/src/redis_hashes.cc b/src/storage/src/redis_hashes.cc
@@ -1150,21 +1150,27 @@ Status Redis::HashesRename(const Slice& key, Redis* new_inst, const Slice& newke
   BaseMetaKey base_meta_key(key);
   BaseMetaKey base_meta_newkey(newkey);
   s = db_->Get(default_read_options_, handles_[kMetaCF], base_meta_key.Encode(), &meta_value);
-  if (s.ok()) {
-    if (IsStale(meta_value)) {
-      return Status::NotFound();
-    }
-    // copy a new hash with newkey
-    ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
-    statistic = parsed_hashes_meta_value.Count();
-    s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
-    new_inst->UpdateSpecificKeyStatistics(DataType::kHashes, newkey.ToString(), statistic);
-
-    // HashesDel key
-    parsed_hashes_meta_value.InitialMetaValue();
-    s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
-    UpdateSpecificKeyStatistics(DataType::kHashes, key.ToString(), statistic);
+  if (!s.ok() || !ExpectedMetaValue(DataType::kHashes, meta_value)) {
+    return s;
+  }
+  if (key == newkey) {
+    return Status::OK();
   }
+
+  if (IsStale(meta_value)) {
+    return Status::NotFound();
+  }
+  // copy a new hash with newkey
+  ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
+  statistic = parsed_hashes_meta_value.Count();
+  s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
+  new_inst->UpdateSpecificKeyStatistics(DataType::kHashes, newkey.ToString(), statistic);
+
+  // HashesDel key
+  parsed_hashes_meta_value.InitialMetaValue();
+  s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
+  UpdateSpecificKeyStatistics(DataType::kHashes, key.ToString(), statistic);
+
   return s;
 }
 
@@ -1178,30 +1184,36 @@ Status Redis::HashesRenamenx(const Slice& key, Redis* new_inst, const Slice& new
   BaseMetaKey base_meta_key(key);
   BaseMetaKey base_meta_newkey(newkey);
   s = db_->Get(default_read_options_, handles_[kMetaCF], base_meta_key.Encode(), &meta_value);
+  if (!s.ok() || !ExpectedMetaValue(DataType::kHashes, meta_value)) {
+    return s;
+  }
+  if (key == newkey) {
+    return Status::Corruption();
+  }
+
+  if (IsStale(meta_value)) {
+    return Status::NotFound();
+  }
+  ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
+  // check if newkey exists.
+  std::string new_meta_value;
+  s = new_inst->GetDB()->Get(default_read_options_, handles_[kMetaCF], base_meta_newkey.Encode(), &new_meta_value);
   if (s.ok()) {
-    if (IsStale(meta_value)) {
-      return Status::NotFound();
+    if (!IsStale(new_meta_value)) {
+      return Status::Corruption();  // newkey already exists.
     }
-    ParsedHashesMetaValue parsed_hashes_meta_value(&meta_value);
-    // check if newkey exists.
-    std::string new_meta_value;
-    s = new_inst->GetDB()->Get(default_read_options_, handles_[kMetaCF], base_meta_newkey.Encode(), &new_meta_value);
-    if (s.ok()) {
-      if (!IsStale(new_meta_value)) {
-        return Status::Corruption();  // newkey already exists.
-      }
-    }
-    ParsedHashesMetaValue parsed_hashes_new_meta_value(&new_meta_value);
-    // copy a new hash with newkey
-    statistic = parsed_hashes_meta_value.Count();
-    s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
-    new_inst->UpdateSpecificKeyStatistics(DataType::kHashes, newkey.ToString(), statistic);
-
-    // HashesDel key
-    parsed_hashes_meta_value.InitialMetaValue();
-    s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
-    UpdateSpecificKeyStatistics(DataType::kHashes, key.ToString(), statistic);
   }
+  ParsedHashesMetaValue parsed_hashes_new_meta_value(&new_meta_value);
+  // copy a new hash with newkey
+  statistic = parsed_hashes_meta_value.Count();
+  s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
+  new_inst->UpdateSpecificKeyStatistics(DataType::kHashes, newkey.ToString(), statistic);
+
+  // HashesDel key
+  parsed_hashes_meta_value.InitialMetaValue();
+  s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
+  UpdateSpecificKeyStatistics(DataType::kHashes, key.ToString(), statistic);
+
   return s;
 }
 

diff --git a/src/storage/src/redis_lists.cc b/src/storage/src/redis_lists.cc
@@ -981,21 +981,27 @@ Status Redis::ListsRename(const Slice& key, Redis* new_inst, const Slice& newkey
   BaseMetaKey base_meta_key(key);
   BaseMetaKey base_meta_newkey(newkey);
   Status s = db_->Get(default_read_options_, handles_[kMetaCF], base_meta_key.Encode(), &meta_value);
-  if (s.ok()) {
-    if (IsStale(meta_value)) {
-      return Status::NotFound();
-    }
-    // copy a new list with newkey
-    ParsedListsMetaValue parsed_lists_meta_value(&meta_value);
-    statistic = parsed_lists_meta_value.Count();
-    s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
-    new_inst->UpdateSpecificKeyStatistics(DataType::kLists, newkey.ToString(), statistic);
+  if (!s.ok() || !ExpectedMetaValue(DataType::kLists, meta_value)) {
+    return s;
+  }
+  if (key == newkey) {
+    return Status::OK();
+  }
 
-    // ListsDel key
-    parsed_lists_meta_value.InitialMetaValue();
-    s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
-    UpdateSpecificKeyStatistics(DataType::kLists, key.ToString(), statistic);
+  if (IsStale(meta_value)) {
+    return Status::NotFound();
   }
+  // copy a new list with newkey
+  ParsedListsMetaValue parsed_lists_meta_value(&meta_value);
+  statistic = parsed_lists_meta_value.Count();
+  s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
+  new_inst->UpdateSpecificKeyStatistics(DataType::kLists, newkey.ToString(), statistic);
+
+  // ListsDel key
+  parsed_lists_meta_value.InitialMetaValue();
+  s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
+  UpdateSpecificKeyStatistics(DataType::kLists, key.ToString(), statistic);
+
   return s;
 }
 
@@ -1008,30 +1014,36 @@ Status Redis::ListsRenamenx(const Slice& key, Redis* new_inst, const Slice& newk
   BaseMetaKey base_meta_key(key);
   BaseMetaKey base_meta_newkey(newkey);
   Status s = db_->Get(default_read_options_, handles_[kMetaCF], base_meta_key.Encode(), &meta_value);
+  if (!s.ok() || !ExpectedMetaValue(DataType::kLists, meta_value)) {
+    return s;
+  }
+  if (key == newkey) {
+    return Status::Corruption();
+  }
+
+  if (IsStale(meta_value)) {
+    return Status::NotFound();
+  }
+  // check if newkey exists.
+  std::string new_meta_value;
+  ParsedListsMetaValue parsed_lists_meta_value(&meta_value);
+  s = new_inst->GetDB()->Get(default_read_options_, handles_[kMetaCF], base_meta_newkey.Encode(), &new_meta_value);
   if (s.ok()) {
-    if (IsStale(meta_value)) {
-      return Status::NotFound();
-    }
-    // check if newkey exists.
-    std::string new_meta_value;
-    ParsedListsMetaValue parsed_lists_meta_value(&meta_value);
-    s = new_inst->GetDB()->Get(default_read_options_, handles_[kMetaCF], base_meta_newkey.Encode(), &new_meta_value);
-    if (s.ok()) {
-      if (IsStale(new_meta_value)) {
-        return Status::Corruption();  // newkey already exists.
-      }
+    if (IsStale(new_meta_value)) {
+      return Status::Corruption();  // newkey already exists.
     }
-    ParsedSetsMetaValue parsed_lists_new_meta_value(&new_meta_value);
-    // copy a new list with newkey
-    statistic = parsed_lists_meta_value.Count();
-    s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
-    new_inst->UpdateSpecificKeyStatistics(DataType::kLists, newkey.ToString(), statistic);
-
-    // ListsDel key
-    parsed_lists_meta_value.InitialMetaValue();
-    s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
-    UpdateSpecificKeyStatistics(DataType::kLists, key.ToString(), statistic);
   }
+  ParsedSetsMetaValue parsed_lists_new_meta_value(&new_meta_value);
+  // copy a new list with newkey
+  statistic = parsed_lists_meta_value.Count();
+  s = new_inst->GetDB()->Put(default_write_options_, handles_[kMetaCF], base_meta_newkey.Encode(), meta_value);
+  new_inst->UpdateSpecificKeyStatistics(DataType::kLists, newkey.ToString(), statistic);
+
+  // ListsDel key
+  parsed_lists_meta_value.InitialMetaValue();
+  s = db_->Put(default_write_options_, handles_[kMetaCF], base_meta_key.Encode(), meta_value);
+  UpdateSpecificKeyStatistics(DataType::kLists, key.ToString(), statistic);
+
   return s;
 }