modify blackwidow variable name

OpenAtomFoundation · Jul 25, 2018 · 7b79d97 · 7b79d97
1 parent 0c96a64
commit 7b79d97
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 33 deletions.
diff --git a/include/pika_bit.h b/include/pika_bit.h
@@ -91,11 +91,11 @@ class BitOpCmd : public Cmd {
 private:
   std::string dest_key_;
   std::vector<std::string> src_keys_;
-  blackwidow::BlackWidow::BitOpType op_;
+  blackwidow::BitOpType op_;
   virtual void Clear() {
     dest_key_ = "";
     src_keys_.clear();
-    op_ = blackwidow::BlackWidow::kBitOpDefault;
+    op_ = blackwidow::kBitOpDefault;
   }
 
   virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);

diff --git a/include/pika_hash.h b/include/pika_hash.h
@@ -113,7 +113,7 @@ class HMsetCmd : public Cmd {
   virtual void Do();
 private:
   std::string key_;
-  std::vector<blackwidow::BlackWidow::FieldValue> fvs_;
+  std::vector<blackwidow::FieldValue> fvs_;
   virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
 };
 

diff --git a/include/pika_kv.h b/include/pika_kv.h
@@ -198,7 +198,7 @@ class MsetCmd : public Cmd {
   MsetCmd() {}
   virtual void Do();
  private:
-  std::vector<blackwidow::BlackWidow::KeyValue> kvs_;
+  std::vector<blackwidow::KeyValue> kvs_;
   virtual void DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info);
   virtual std::string ToBinlog(
       const PikaCmdArgsType& argv,
@@ -212,7 +212,7 @@ class MsetnxCmd : public Cmd {
   MsetnxCmd() {}
   virtual void Do();
  private:
-  std::vector<blackwidow::BlackWidow::KeyValue> kvs_;
+  std::vector<blackwidow::KeyValue> kvs_;
   int32_t success_;
   virtual void DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info);
   virtual std::string ToBinlog(

diff --git a/include/pika_list.h b/include/pika_list.h
@@ -28,11 +28,11 @@ class LIndexCmd : public Cmd {
 
 class LInsertCmd : public Cmd {
   public:
-    LInsertCmd() : dir_(blackwidow::BlackWidow::After) {};
+    LInsertCmd() : dir_(blackwidow::After) {};
     virtual void Do();
   private:
     std::string key_;
-    blackwidow::BlackWidow::BeforeOrAfter dir_;
+    blackwidow::BeforeOrAfter dir_;
     std::string pivot_;
     std::string value_;
     virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);

diff --git a/include/pika_zset.h b/include/pika_zset.h
@@ -19,7 +19,7 @@ class ZAddCmd : public Cmd {
   virtual void Do();
 private:
   std::string key_;
-  std::vector<blackwidow::BlackWidow::ScoreMember> score_members;
+  std::vector<blackwidow::ScoreMember> score_members;
   virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
 };
 
@@ -141,16 +141,16 @@ class ZRemCmd : public Cmd {
 
 class ZsetUIstoreParentCmd : public Cmd {
 public:
-  ZsetUIstoreParentCmd() : aggregate_(blackwidow::BlackWidow::SUM) {}
+  ZsetUIstoreParentCmd() : aggregate_(blackwidow::SUM) {}
 protected:
   std::string dest_key_;
   int64_t num_keys_;
-  blackwidow::BlackWidow::AGGREGATE aggregate_;
+  blackwidow::AGGREGATE aggregate_;
   std::vector<std::string> keys_;
   std::vector<double> weights_;
   virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info);
   virtual void Clear() {
-    aggregate_ = blackwidow::BlackWidow::SUM;
+    aggregate_ = blackwidow::SUM;
   }
 };
 

diff --git a/src/pika_bit.cc b/src/pika_bit.cc
@@ -184,21 +184,21 @@ void BitOpCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
   }
   std::string op_str = slash::StringToLower(argv[1]);
   if (op_str == "not") {
-    op_ = blackwidow::BlackWidow::kBitOpNot;
+    op_ = blackwidow::kBitOpNot;
   } else if (op_str == "and") {
-    op_ = blackwidow::BlackWidow::kBitOpAnd;
+    op_ = blackwidow::kBitOpAnd;
   } else if (op_str == "or") {
-    op_ = blackwidow::BlackWidow::kBitOpOr;
+    op_ = blackwidow::kBitOpOr;
   } else if (op_str == "xor") {
-    op_ = blackwidow::BlackWidow::kBitOpXor;
+    op_ = blackwidow::kBitOpXor;
   } else {
     res_.SetRes(CmdRes::kSyntaxErr, kCmdNameBitOp);
     return;
   }
-  if (op_ == blackwidow::BlackWidow::kBitOpNot && argv.size() != 4) {
+  if (op_ == blackwidow::kBitOpNot && argv.size() != 4) {
       res_.SetRes(CmdRes::kWrongBitOpNotNum, kCmdNameBitOp);
       return;
-  } else if (op_ != blackwidow::BlackWidow::kBitOpNot && argv.size() < 4) {
+  } else if (op_ != blackwidow::kBitOpNot && argv.size() < 4) {
       res_.SetRes(CmdRes::kWrongNum, kCmdNameBitOp);
       return;
   } else if (argv.size() >= kMaxBitOpInputKey) {

diff --git a/src/pika_hash.cc b/src/pika_hash.cc
@@ -92,7 +92,7 @@ void HGetallCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info)
 }
 
 void HGetallCmd::Do() {
-  std::vector<blackwidow::BlackWidow::FieldValue> fvs;
+  std::vector<blackwidow::FieldValue> fvs;
   rocksdb::Status s = g_pika_server->bdb()->HGetall(key_, &fvs);
   if (s.ok()) {
     res_.AppendArrayLen(fvs.size() * 2);

diff --git a/src/pika_kv.cc b/src/pika_kv.cc
@@ -114,7 +114,7 @@ void DelCmd::Do() {
     SlotKeyRem(*it);
   }
 
-  std::map<blackwidow::BlackWidow::DataType, blackwidow::Status> type_status;
+  std::map<blackwidow::DataType, blackwidow::Status> type_status;
   int64_t count = g_pika_server->bdb()->Del(keys_, &type_status);
   if (count >= 0) {
     res_.AppendInteger(count);
@@ -577,7 +577,7 @@ void MsetCmd::Do() {
   blackwidow::Status s = g_pika_server->bdb()->MSet(kvs_);
   if (s.ok()) {
     res_.SetRes(CmdRes::kOk);
-    std::vector<blackwidow::BlackWidow::KeyValue>::const_iterator it;
+    std::vector<blackwidow::KeyValue>::const_iterator it;
     for (it = kvs_.begin(); it != kvs_.end(); it++) {
       SlotKeyAdd("k", it->key);
     }
@@ -594,7 +594,7 @@ std::string MsetCmd::ToBinlog(
   std::string res;
   res.reserve(RAW_ARGS_LEN);
 
-  std::vector<blackwidow::BlackWidow::KeyValue>::const_iterator it;
+  std::vector<blackwidow::KeyValue>::const_iterator it;
   for (it = kvs_.begin(); it != kvs_.end(); it++) {
     RedisAppendLen(res, 3 + 4, "*");
 
@@ -636,7 +636,7 @@ void MsetnxCmd::Do() {
   rocksdb::Status s = g_pika_server->bdb()->MSetnx(kvs_, &success_);
   if (s.ok()) {
     res_.AppendInteger(success_);
-    std::vector<blackwidow::BlackWidow::KeyValue>::const_iterator it;
+    std::vector<blackwidow::KeyValue>::const_iterator it;
     for (it = kvs_.begin(); it != kvs_.end(); it++) {
       SlotKeyAdd("k", it->key);
     }
@@ -654,7 +654,7 @@ std::string MsetnxCmd::ToBinlog(
   if (success_) {
     res.reserve(RAW_ARGS_LEN);
 
-    std::vector<blackwidow::BlackWidow::KeyValue>::const_iterator it;
+    std::vector<blackwidow::KeyValue>::const_iterator it;
     for (it = kvs_.begin(); it != kvs_.end(); it++) {
       RedisAppendLen(res, 3 + 4, "*");
 

diff --git a/src/pika_list.cc b/src/pika_list.cc
@@ -45,9 +45,9 @@ void LInsertCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info)
   key_ = argv[1];
   std::string dir = slash::StringToLower(argv[2]);
   if (dir == "before" ) {
-    dir_ = blackwidow::BlackWidow::Before;
+    dir_ = blackwidow::Before;
   } else if (dir == "after") {
-    dir_ = blackwidow::BlackWidow::After;
+    dir_ = blackwidow::After;
   } else {
     res_.SetRes(CmdRes::kSyntaxErr);
     return;

diff --git a/src/pika_zset.cc b/src/pika_zset.cc
@@ -209,7 +209,7 @@ void ZRangeCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info)
 }
 
 void ZRangeCmd::Do() {
-  std::vector<blackwidow::BlackWidow::ScoreMember> score_members;
+  std::vector<blackwidow::ScoreMember> score_members;
   rocksdb::Status s = g_pika_server->bdb()->ZRange(key_, start_, stop_, &score_members);
   if (s.ok()) {
     if (is_ws_) {
@@ -245,7 +245,7 @@ void ZRevrangeCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_inf
 }
 
 void ZRevrangeCmd::Do() {
-  std::vector<blackwidow::BlackWidow::ScoreMember> score_members;
+  std::vector<blackwidow::ScoreMember> score_members;
   rocksdb::Status s = g_pika_server->bdb()->ZRevrange(key_, start_, stop_, &score_members);
   if (s.ok()) {
     if (is_ws_) {
@@ -358,7 +358,7 @@ void ZRangebyscoreCmd::Do() {
     res_.AppendContent("*0");
     return;
   }
-  std::vector<blackwidow::BlackWidow::ScoreMember> score_members;
+  std::vector<blackwidow::ScoreMember> score_members;
   rocksdb::Status s = g_pika_server->bdb()->ZRangebyscore(key_, min_score_, max_score_, left_close_, right_close_, &score_members);
   if (!s.ok() && !s.IsNotFound()) {
     res_.SetRes(CmdRes::kErrOther, s.ToString());
@@ -400,7 +400,7 @@ void ZRevrangebyscoreCmd::Do() {
     res_.AppendContent("*0");
     return;
   }
-  std::vector<blackwidow::BlackWidow::ScoreMember> score_members;
+  std::vector<blackwidow::ScoreMember> score_members;
   rocksdb::Status s = g_pika_server->bdb()->ZRevrangebyscore(key_, min_score_, max_score_, left_close_, right_close_, &score_members);
   if (!s.ok() && !s.IsNotFound()) {
     res_.SetRes(CmdRes::kErrOther, s.ToString());
@@ -526,11 +526,11 @@ void ZsetUIstoreParentCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const
       }
       slash::StringToLower(argv[index]);
       if (argv[index] == "sum") {
-        aggregate_ = blackwidow::BlackWidow::SUM;
+        aggregate_ = blackwidow::SUM;
       } else if (argv[index] == "min") {
-        aggregate_ = blackwidow::BlackWidow::MIN;
+        aggregate_ = blackwidow::MIN;
       } else if (argv[index] == "max") {
-        aggregate_ = blackwidow::BlackWidow::MAX;
+        aggregate_ = blackwidow::MAX;
       } else {
         res_.SetRes(CmdRes::kSyntaxErr);
         return;

diff --git a/third/blackwidow b/third/blackwidow
+3 −0		.gitmodules
+8 −1		Makefile
+1 −0		deps/slash
+102 −55		include/blackwidow/blackwidow.h
+153 −36		src/blackwidow.cc
+3 −3		src/redis_hashes.cc
+2 −2		src/redis_hashes.h
+5 −5		src/redis_lists.cc
+1 −1		src/redis_lists.h
+6 −6		src/redis_sets.cc
+11 −11		src/redis_strings.cc
+3 −3		src/redis_strings.h
+26 −26		src/redis_zsets.cc
+7 −7		src/redis_zsets.h
+13 −3		tests/Makefile
+29 −29		tests/gtest_hashes.cc
+3 −3		tests/gtest_hyperloglog.cc
+9 −9		tests/gtest_keys.cc
+39 −39		tests/gtest_lists.cc
+12 −12		tests/gtest_sets.cc
+11 −11		tests/gtest_strings.cc
+208 −208		tests/gtest_zsets.cc