Support keys for select by type (OpenAtomFoundation#179)

* Support keys for select by type

* limit the number of parameter

* rename parameters

* fix code

* remove redundant code

include/pika_kv.h

@@ -126,11 +126,15 @@ class MgetCmd : public Cmd {
 
 class KeysCmd : public Cmd {
 public:
-  KeysCmd() {}
+  KeysCmd() : type_("all") {}
   virtual void Do();
 private:
   std::string pattern_;
+  std::string type_;
   virtual void DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info);
+  virtual void Clear() {
+    type_ = "all";
+  }
 };
 
 class SetnxCmd : public Cmd {

pikatests.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+rm -rf ./log
+rm -rf .db
 cp output/bin/pika src/redis-server
 cp output/conf/pika.conf tests/assets/default.conf
 

src/pika_command.cc

@@ -123,7 +123,7 @@ void InitCmdInfoTable() {
   CmdInfo* mgetptr = new CmdInfo(kCmdNameMget, -2, kCmdFlagsRead | kCmdFlagsKv);
   cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameMget, mgetptr));
   ////Keys
-  CmdInfo* keysptr = new CmdInfo(kCmdNameKeys, 2, kCmdFlagsRead | kCmdFlagsKv);
+  CmdInfo* keysptr = new CmdInfo(kCmdNameKeys, -2, kCmdFlagsRead | kCmdFlagsKv);
   cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameKeys, keysptr));
   ////Setnx
   CmdInfo* setnxptr = new CmdInfo(kCmdNameSetnx, 3, kCmdFlagsWrite | kCmdFlagsKv);

src/pika_kv.cc

@@ -340,12 +340,22 @@ void KeysCmd::DoInitial(PikaCmdArgsType &argv, const CmdInfo* const ptr_info) {
     return;
   }
   pattern_ = argv[1];
+  if (argv.size() == 3) {
+    std::string opt = slash::StringToLower(argv[2]);
+    if (opt == "string" || opt == "zset" || opt == "set" || opt == "list" || opt == "hash") {
+        type_ = opt;
+    } else {
+      res_.SetRes(CmdRes::kSyntaxErr);
+    }
+  } else if (argv.size() > 3) {
+    res_.SetRes(CmdRes::kSyntaxErr);
+  }
   return;
 }
 
 void KeysCmd::Do() {
   std::vector<std::string> keys;
-  nemo::Status s = g_pika_server->db()->Keys(pattern_, keys);
+  nemo::Status s = g_pika_server->db()->Keys(pattern_, keys, type_);
   res_.AppendArrayLen(keys.size());
   for (std::vector<std::string>::iterator iter = keys.begin(); iter != keys.end(); iter++) {
     res_.AppendStringLen(iter->size());

tests/unit/keys.tcl

@@ -0,0 +1,54 @@
+start_server {tags {"keys"}} {
+  test {KEYS with pattern} {
+    foreach key {key_x key_y key_z foo_a foo_b foo_c} {
+      r set $key hello
+    }
+    assert_equal {foo_a foo_b foo_c} [r keys foo*]
+    assert_equal {foo_a foo_b foo_c} [r keys f*]
+    assert_equal {foo_a foo_b foo_c} [r keys f*o*]
+  }
+
+  test {KEYS to get all keys} {
+    lsort [r keys *]
+  } {foo_a foo_b foo_c key_x key_y key_z}
+
+  test {KEYS select by type} {
+    foreach key {key_x key_y key_z foo_a foo_b foo_c} {
+      r del $key
+    }
+    r set kv_1 value
+    r set kv_2 value
+    r hset hash_1 hash_field 1
+    r hset hash_2 hash_field 1
+    r lpush list_1 value
+    r lpush list_2 value
+    r zadd zset_1 1 "a"
+    r zadd zset_2 1 "a"
+    r sadd set_1 "a"
+    r sadd set_2 "a"
+    assert_equal {kv_1 kv_2} [r keys * string]
+    assert_equal {hash_1 hash_2} [r keys * hash]
+    assert_equal {list_1 list_2} [r keys * list]
+    assert_equal {zset_1 zset_2} [r keys * zset]
+    assert_equal {set_1 set_2} [r keys * set]
+    assert_equal {kv_1 kv_2 hash_1 hash_2 zset_1 zset_2 set_1 set_2 list_1 list_2} [r keys *]
+    assert_equal {kv_1 kv_2} [r keys * STRING]
+    assert_equal {hash_1 hash_2} [r keys * HASH]
+    assert_equal {list_1 list_2} [r keys * LIST]
+    assert_equal {zset_1 zset_2} [r keys * ZSET]
+    assert_equal {set_1 set_2} [r keys * SET]
+  }
+
+  test {KEYS syntax error} {
+    catch {r keys * a} e1
+    catch {r keys * strings} e2
+    catch {r keys * c d} e3
+    catch {r keys} e4
+    catch {r keys * set zset} e5
+    assert_equal {ERR syntax error} [set e1]
+    assert_equal {ERR syntax error} [set e2]
+    assert_equal {ERR syntax error} [set e3]
+    assert_equal {ERR wrong number of arguments for 'keys' command} [set e4]
+    assert_equal {ERR syntax error} [set e5]
+  }
+}