polish some code

apache · Nov 11, 2023 · 2ad17b0 · 2ad17b0
1 parent f9802df
commit 2ad17b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/src/commands/cmd_json.cc b/src/commands/cmd_json.cc
@@ -399,10 +399,6 @@ class CommandJsonNumIncrBy : public Commander {
   Status Execute(Server *svr, Connection *conn, std::string *output) override {
     redis::Json json(svr->storage, conn->GetNamespace());
 
-    if (args_.size() != 4) {
-      return {Status::RedisExecErr, errWrongNumOfArguments};
-    }
-
     JsonValue result = JsonValue::FromString("[]").GetValue();
     auto s = json.NumIncrBy(args_[1], args_[2], args_[3], &result);
     if (!s.ok()) {
@@ -420,10 +416,6 @@ class CommandJsonNumMultBy : public Commander {
   Status Execute(Server *svr, Connection *conn, std::string *output) override {
     redis::Json json(svr->storage, conn->GetNamespace());
 
-    if (args_.size() != 4) {
-      return {Status::RedisExecErr, errWrongNumOfArguments};
-    }
-
     JsonValue result = JsonValue::FromString("[]").GetValue();
     auto s = json.NumMultBy(args_[1], args_[2], args_[3], &result);
     if (!s.ok()) {
@@ -448,7 +440,7 @@ REDIS_REGISTER_COMMANDS(MakeCmdAttr<CommandJsonSet>("json.set", 4, "write", 1, 1
                         MakeCmdAttr<CommandJsonObjkeys>("json.objkeys", -2, "read-only", 1, 1, 1),
                         MakeCmdAttr<CommandJsonArrPop>("json.arrpop", -2, "write", 1, 1, 1),
                         MakeCmdAttr<CommanderJsonArrIndex>("json.arrindex", -4, "read-only", 1, 1, 1),
-                        MakeCmdAttr<CommandJsonNumIncrBy>("json.numincrby", -4, "write", 1, 1, 1),
-                        MakeCmdAttr<CommandJsonNumMultBy>("json.nummultby", -4, "write", 1, 1, 1), );
+                        MakeCmdAttr<CommandJsonNumIncrBy>("json.numincrby", 4, "write", 1, 1, 1),
+                        MakeCmdAttr<CommandJsonNumMultBy>("json.nummultby", 4, "write", 1, 1, 1), );
 
 }  // namespace redis
diff --git a/src/types/json.h b/src/types/json.h
@@ -449,9 +449,8 @@ struct JsonValue {
           if (std::isinf(v)) {
             status = {Status::RedisExecErr, "result is not number"};
             return;
-          } else {
-            origin = v;
           }
+          origin = v;
         } else {
           if (op == NumOpEnum::Incr) {
             origin = NumOpIncrBy<int64_t>(origin.as_integer<int64_t>(), number.value.as_integer<int64_t>());

diff --git a/src/types/redis_json.cc b/src/types/redis_json.cc
@@ -354,7 +354,7 @@ rocksdb::Status Json::numop(NumOpEnum op, const std::string &user_key, const std
   JsonValue number;
   auto number_res = JsonValue::FromString(value);
   if (!number_res || !number_res.GetValue().value.is_number()) {
-    return rocksdb::Status::InvalidArgument("should be number");
+    return rocksdb::Status::InvalidArgument("should be a number");
   }
   number = std::move(number_res.GetValue());