fix: list rename cmd (#165)

Author: AlexStocks

src/net/net_options.h

@@ -14,24 +14,24 @@ class NetOptions {
   NetOptions() = default;
   ~NetOptions() = default;
 
-  void SetThreadNum(int8_t threadNum) { threadNum_ = threadNum; }
+  void SetThreadNum(int8_t number) { thread_num_ = number; }
 
-  int8_t GetThreadNum() const { return threadNum_; }
+  int8_t GetThreadNum() const { return thread_num_; }
 
-  void SetRwSeparation(bool rwSeparation = true) { rwSeparation_ = rwSeparation; }
+  void SetRwSeparation(bool spearation = true) { rw_separation_ = spearation; }
 
-  bool GetRwSeparation() const { return rwSeparation_; }
+  bool GetRwSeparation() const { return rw_separation_; }
 
-  void SetOpTcpKeepAlive(uint32_t tcpKeepAlive) { tcpKeepAlive_ = tcpKeepAlive; }
+  void SetOpTcpKeepAlive(uint32_t timeout) { tcp_keepalive_timeout_ = timeout; }
 
-  uint32_t GetOpTcpKeepAlive() const { return tcpKeepAlive_; }
+  uint32_t GetOpTcpKeepAlive() const { return tcp_keepalive_timeout_; }
 
  private:
-  bool rwSeparation_ = true;  // Whether to separate read and write
+  bool rw_separation_ = true;  // Whether to separate read and write
 
-  int8_t threadNum_ = 1;  // The number of threads
+  int8_t thread_num_ = 1;  // The number of threads
 
-  uint32_t tcpKeepAlive_ = 300;  // The timeout of the keepalive connection in seconds
+  uint32_t tcp_keepalive_timeout_ = 300;  // The timeout of the keepalive connection in seconds
 };
 
 }  // namespace net

src/storage/src/redis_lists.cc

@@ -973,6 +973,7 @@ Status Redis::RPushx(const Slice& key, const std::vector<std::string>& values, u
 }
 
 Status Redis::ListsRename(const Slice& key, Redis* new_inst, const Slice& newkey) {
+  auto batch = Batch::CreateBatch(this);
   std::string meta_value;
   uint32_t statistic = 0;
   const std::vector<std::string> keys = {key.ToString(), newkey.ToString()};
@@ -994,18 +995,45 @@ Status Redis::ListsRename(const Slice& key, Redis* new_inst, const Slice& newkey
   // 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);
+
+  // todo if value is too many, will slow to rename
+  uint32_t version = parsed_lists_meta_value.Version();
+  uint64_t index = parsed_lists_meta_value.LeftIndex() + 1;
+  uint64_t right_index = parsed_lists_meta_value.RightIndex() - 1;
+  ListsDataKey base_lists_data_key(key, version, index);
+  std::vector<std::string> list_nodes;
+  rocksdb::Iterator* iter = db_->NewIterator(default_read_options_, handles_[kListsDataCF]);
+  uint64_t current_index = index;
+  for (iter->Seek(base_lists_data_key.Encode()); iter->Valid() && current_index <= right_index;
+       iter->Next(), current_index++) {
+    ParsedBaseDataValue parsed_value(iter->value());
+    list_nodes.push_back(parsed_value.UserValue().ToString());
+  }
+  delete iter;
+
+  // write new data value
+  current_index = index;
+  for (const auto& node : list_nodes) {
+    ListsDataKey new_lists_data_key(newkey, version, current_index++);
+    BaseDataValue n_val(node);
+    batch->Put(kListsDataCF, new_lists_data_key.Encode(), n_val.Encode());
+  }
+  // write new meta_key
+  batch->Put(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);
+  batch->Delete(kListsDataCF, base_meta_key.Encode());
   UpdateSpecificKeyStatistics(DataType::kLists, key.ToString(), statistic);
 
-  return s;
+  return batch->Commit();
 }
 
 Status Redis::ListsRenamenx(const Slice& key, Redis* new_inst, const Slice& newkey) {
+  auto batch = Batch::CreateBatch(this);
+
   std::string meta_value;
   uint32_t statistic = 0;
   const std::vector<std::string> keys = {key.ToString(), newkey.ToString()};
@@ -1029,22 +1057,48 @@ Status Redis::ListsRenamenx(const Slice& key, Redis* new_inst, const Slice& newk
   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)) {
+    ParsedListsMetaValue parsed_lists_new_meta_value(new_meta_value);
+    if (parsed_lists_new_meta_value.Count() != 0 || parsed_lists_new_meta_value.IsStale()) {
       return Status::Corruption();  // newkey already exists.
     }
   }
-  ParsedSetsMetaValue parsed_lists_new_meta_value(&new_meta_value);
+  // ParsedListsMetaValue 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);
+
+  // todo if value is too many, will slow to rename
+  uint32_t version = parsed_lists_meta_value.Version();
+  uint64_t index = parsed_lists_meta_value.LeftIndex() + 1;
+  uint64_t right_index = parsed_lists_meta_value.RightIndex() - 1;
+  ListsDataKey base_lists_data_key(key, version, index);
+  std::vector<std::string> list_nodes;
+  rocksdb::Iterator* iter = db_->NewIterator(default_read_options_, handles_[kListsDataCF]);
+  uint64_t current_index = index;
+  for (iter->Seek(base_lists_data_key.Encode()); iter->Valid() && current_index <= right_index;
+       iter->Next(), current_index++) {
+    ParsedBaseDataValue parsed_value(iter->value());
+    list_nodes.push_back(parsed_value.UserValue().ToString());
+  }
+  delete iter;
+
+  // write new data value
+  current_index = index;
+  for (const auto& node : list_nodes) {
+    ListsDataKey new_lists_data_key(newkey, version, current_index++);
+    BaseDataValue n_val(node);
+    batch->Put(kListsDataCF, new_lists_data_key.Encode(), n_val.Encode());
+  }
+  // write new meta_key
+  batch->Put(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);
+  batch->Delete(kListsDataCF, base_meta_key.Encode());
   UpdateSpecificKeyStatistics(DataType::kLists, key.ToString(), statistic);
 
-  return s;
+  return batch->Commit();
 }
 
 void Redis::ScanLists() {