fix bitpos strlen msetnx

OpenAtomFoundation · Nov 15, 2023 · 01f0315 · 01f0315
1 parent 7f671fa
commit 01f0315
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/conf/pika.conf b/conf/pika.conf
@@ -431,7 +431,7 @@ cache-num : 16
 # cache-model 0:cache_none 1:cache_read
 cache-model : 1
 # cache-type: string, set, zset, list, hash, bit
-cache-type: string, set, zset, list, hash, bit
+cache-type: string, set, zset, list, hash
 # cache-start-direction 0:cache first ${cache-items-per-key} items; -1:cache last ${cache-items-per-key} items
 cache-start-direction : 0
 cache-items-per-key : 512

diff --git a/include/pika_kv.h b/include/pika_kv.h
@@ -439,7 +439,6 @@ class MsetnxCmd : public Cmd {
   void DoInitial() override;
   // used for write binlog
   std::shared_ptr<SetCmd> set_cmd_;
-  rocksdb::Status s_;
 };
 
 class GetrangeCmd : public Cmd {

diff --git a/src/pika_command.cc b/src/pika_command.cc
@@ -255,7 +255,7 @@ void InitCmdTable(CmdTable* cmd_table) {
   cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameSetrange, std::move(setrangeptr)));
   ////StrlenCmd
   std::unique_ptr<Cmd> strlenptr =
-      std::make_unique<StrlenCmd>(kCmdNameStrlen, 2, kCmdFlagsRead | kCmdFlagsSingleSlot | kCmdFlagsKv |  kCmdFlagsDoThroughDB | kCmdFlagsUpdateCache);
+      std::make_unique<StrlenCmd>(kCmdNameStrlen, 2, kCmdFlagsRead | kCmdFlagsSingleSlot | kCmdFlagsKv |  kCmdFlagsDoThroughDB | kCmdFlagsUpdateCache | kCmdFlagsReadCache);
   cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameStrlen, std::move(strlenptr)));
   ////ExistsCmd
   std::unique_ptr<Cmd> existsptr =
@@ -618,7 +618,7 @@ void InitCmdTable(CmdTable* cmd_table) {
   cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameBitCount, std::move(bitcountptr)));
   ////bitposCmd
   std::unique_ptr<Cmd> bitposptr =
-      std::make_unique<BitPosCmd>(kCmdNameBitPos, -3, kCmdFlagsRead | kCmdFlagsSingleSlot | kCmdFlagsBit | kCmdFlagsDoThroughDB | kCmdFlagsUpdateCache);
+      std::make_unique<BitPosCmd>(kCmdNameBitPos, -3, kCmdFlagsRead | kCmdFlagsSingleSlot | kCmdFlagsBit| kCmdFlagsDoThroughDB | kCmdFlagsUpdateCache | kCmdFlagsReadCache);
   cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameBitPos, std::move(bitposptr)));
   ////bitopCmd
   std::unique_ptr<Cmd> bitopptr =

diff --git a/src/pika_kv.cc b/src/pika_kv.cc
@@ -927,15 +927,15 @@ void MsetnxCmd::DoInitial() {
 
 void MsetnxCmd::Do(std::shared_ptr<Slot> slot) {
   success_ = 0;
-  s_ = slot->db()->MSetnx(kvs_, &success_);
-  if (s_.ok()) {
+  rocksdb::Status s = slot->db()->MSetnx(kvs_, &success_);
+  if (s.ok()) {
     res_.AppendInteger(success_);
     std::vector<storage::KeyValue>::const_iterator it;
     for (it = kvs_.begin(); it != kvs_.end(); it++) {
       AddSlotKey("k", it->key, slot);
     }
   } else {
-    res_.SetRes(CmdRes::kErrOther, s_.ToString());
+    res_.SetRes(CmdRes::kErrOther, s.ToString());
   }
 }
 
@@ -1059,6 +1059,8 @@ void StrlenCmd::DoInitial() {
     res_.SetRes(CmdRes::kWrongNum, kCmdNameStrlen);
     return;
   }
+  LOG(INFO) << "key:" << key_ ;
+  LOG(INFO) << "argv_[1]" << argv_[1];
   key_ = argv_[1];
 }
 
@@ -1067,6 +1069,7 @@ void StrlenCmd::Do(std::shared_ptr<Slot> slot) {
   s_ = slot->db()->Strlen(key_, &len);
   if (s_.ok() || s_.IsNotFound()) {
     res_.AppendInteger(len);
+
   } else {
     res_.SetRes(CmdRes::kErrOther, s_.ToString());
   }