Modify command structure

include/pika_command.h

@@ -37,68 +37,74 @@ enum CmdRes {
 
 static const std::string CmdNameSet = "set";
 
-
+class CmdInfo {
+public:
+    CmdInfo(const std::string _name, int _num, int16_t _flag) : name_(_name), arity_(_num), flag_(_flag) {}
+    bool CheckArg(int num) const {
+        if ((arity_ > 0 && num != arity_) || (arity_ < 0 && num < -arity_)) {
+            return false;
+        }
+        return true;
+    }
+    int16_t flag_rw() const { 
+        return flag_ & CmdFlagsMaskRW; 
+    }
+    int16_t flag_type() const {
+        return flag_ & CmdFlagsMaskType;
+    }
+    int16_t flag_local() const {
+        return flag_ & CmdFlagsMaskLocal;
+    }
+    int16_t flag_prior() const {
+        return flag_ & CmdFlagsMaskPrior;
+    }
+    std::string name() const {
+        return name_;
+    }
+private:
+    std::string name_;
+    int arity_;
+    int flag_;
+};
 
 class Cmd {
 public:
-    Cmd(const std::string _name, int _num, int16_t _flag) : name_(_name), arity_(_num), flag_(_flag) {};
-    Cmd() {};
-    virtual ~Cmd() = 0;
+    virtual ~Cmd() {}
     virtual int16_t Do(PikaCmdArgsType &argvs, std::string &ret) = 0;
-    int16_t flag()    { return flag_; }
-    std::string name()      { return name_; }
+    virtual const CmdInfo& cmd_info() = 0;
 
 protected:
     virtual bool Initial(PikaCmdArgsType &argvs, std::string &ret) = 0;
-    std::string PopArg(PikaCmdArgsType& arg, bool keyword = false);
-    bool CheckArg(const PikaCmdArgsType& argv);
-
-private:
-    std::string name_;
-    int arity_;
-    int16_t flag_;
 };
 
-class CmdGenerator {
-public:
-    static Cmd* getCmd(const std::string& opt);
-};
+Cmd* getCmd(const std::string& opt);
+std::string PopArg(PikaCmdArgsType& arg, bool keyword = false);
 
 class CmdHolder : public Cmd{
 public:
     explicit CmdHolder(const std::string& opt) : valid_(true){
-        cmd_ = CmdGenerator::getCmd(opt);
-        if (cmd_ == NULL) { valid_ = false; }
+        cmd_ = getCmd(opt);
+        if (cmd_ == NULL) {
+            valid_ = false;
+        }
     }
     ~CmdHolder() {
         if (valid_) delete cmd_;
     }
     int16_t Do(PikaCmdArgsType &argvs, std::string &ret) {
-            return cmd_->Do(argvs, ret);
+        return cmd_->Do(argvs, ret);
+    }
+    const CmdInfo& cmd_info() {
+        return cmd_->cmd_info();
+    }
+    bool valid() {
+        return valid_;
     }
-    int16_t flag() { return cmd_->flag(); }
-    std::string name() { return cmd_->name(); }
-    bool valid() { return valid_; }
     
 private:
     Cmd* cmd_;
     bool valid_;
 };
 
-/*
- * kv
- */
-class SetCmd : public Cmd {
-public:
-    enum SetCondition{ANY, NX, XX};
-    SetCmd() : Cmd(CmdNameSet, -2, CmdFlagsWrite | CmdFlagsKv), sec_(0), condition_(ANY) {};
-    int16_t Do(PikaCmdArgsType &argvs, std::string &ret);
-private:
-    std::string key_;
-    std::string value_;
-    int64_t sec_;
-    SetCmd::SetCondition condition_;
-    bool Initial(PikaCmdArgsType &argvs, std::string &ret);
-};
 
 #endif

include/pika_kv.h

+#ifndef __PIKA_KV_H__
+#define __PIKA_KV_H__
+#include "pika_command.h"
+
+
+/*
+ * kv
+ */
+class SetCmd : public Cmd {
+public:
+    enum SetCondition{ANY, NX, XX};
+    SetCmd() : sec_(0), condition_(ANY) {};
+    int16_t Do(PikaCmdArgsType &argvs, std::string &ret);
+    const CmdInfo& cmd_info() {
+        return info_;
+    }
+private:
+    static const CmdInfo info_;
+    std::string key_;
+    std::string value_;
+    int64_t sec_;
+    SetCmd::SetCondition condition_;
+    bool Initial(PikaCmdArgsType &argvs, std::string &ret);
+};
+
+#endif

src/pika_command.cc

 #include <algorithm>
-#include "pika_command.h"
+#include "pika_kv.h"
 
-Cmd* CmdGenerator::getCmd(const std::string& opt) {
+const CmdInfo SetCmd::info_(CmdNameSet, -2, CmdFlagsWrite | CmdFlagsKv);
+
+Cmd* getCmd(const std::string& opt) {
     Cmd* cmd = NULL;
     if (opt == CmdNameSet) {
         cmd = new SetCmd();
@@ -10,7 +12,8 @@ Cmd* CmdGenerator::getCmd(const std::string& opt) {
     }
     return cmd;
 }
-std::string Cmd::PopArg(PikaCmdArgsType& argv, bool keyword) {
+
+std::string PopArg(PikaCmdArgsType& argv, bool keyword) {
     std::string next = argv.front();
     argv.pop_front();
     if (keyword) {
@@ -19,11 +22,3 @@ std::string Cmd::PopArg(PikaCmdArgsType& argv, bool keyword) {
     return next;
 }
 
-bool Cmd::CheckArg(const PikaCmdArgsType& argv) {
-    if ((arity_ > 0 && (int)argv.size() != arity_) ||
-            (arity_ < 0 && (int)argv.size() < -arity_)) {
-        return false;
-    }
-    return true;
-}
-

src/pika_kv.cc

 #include "nemo.h"
-#include "pika_command.h"
-//#include "pika_server.h"
+#include "pika_kv.h"
 #include <algorithm>
 
-//class PikaServer {
-//public:
-//    nemo::Nemo* GetHandle() {return db_;}
-//private:
-//    nemo::Nemo *db_;
-//};
-//extern int string2l(const char *s, size_t slen, long *value);
 extern PikaServer *g_pikaServer;
 
 bool SetCmd::Initial(PikaCmdArgsType &argv, std::string &ret) {
-    if (!CheckArg(argv)) {
-        ret = "-ERR wrong number of arguments for " + name() + " command\r\n";
+    if (!info_.CheckArg(argv.size())) {
+        ret = "-ERR wrong number of arguments for " + info_.name() + " command\r\n";
         return false;
     }
     key_ = PopArg(argv);
@@ -58,6 +50,7 @@ int16_t SetCmd::Do(PikaCmdArgsType &argv, std::string &ret) {
             break;
         default:
             s = g_pikaServer->GetHandle()->Set(key_, value_, sec_);
+            break;
     }
 
     if (s.ok() || s.IsNotFound()) {