Merge branch 'unstable' into json-strappend

Author: guojidan

src/commands/cmd_json.cc

@@ -389,6 +389,39 @@ class CommandJsonArrPop : public Commander {
   int64_t index_ = -1;
 };
 
+class CommandJsonObjLen : public Commander {
+ public:
+  Status Execute(Server *svr, Connection *conn, std::string *output) override {
+    redis::Json json(svr->storage, conn->GetNamespace());
+
+    std::string path = "$";
+    if (args_.size() == 3) {
+      path = args_[2];
+    } else if (args_.size() > 3) {
+      return {Status::RedisExecErr, "The number of arguments is more than expected"};
+    }
+
+    std::vector<std::optional<uint64_t>> results;
+    auto s = json.ObjLen(args_[1], path, results);
+    if (s.IsNotFound()) {
+      *output = redis::NilString();
+      return Status::OK();
+    }
+    if (!s.ok()) return {Status::RedisExecErr, s.ToString()};
+
+    *output = redis::MultiLen(results.size());
+    for (const auto &len : results) {
+      if (len.has_value()) {
+        *output += redis::Integer(len.value());
+      } else {
+        *output += redis::NilString();
+      }
+    }
+
+    return Status::OK();
+  }
+};
+
 class CommandJsonArrTrim : public Commander {
  public:
   Status Parse(const std::vector<std::string> &args) override {
@@ -608,6 +641,7 @@ REDIS_REGISTER_COMMANDS(MakeCmdAttr<CommandJsonSet>("json.set", 4, "write", 1, 1
                         MakeCmdAttr<CommandJsonDel>("json.forget", -2, "write", 1, 1, 1),
                         MakeCmdAttr<CommandJsonNumIncrBy>("json.numincrby", 4, "write", 1, 1, 1),
                         MakeCmdAttr<CommandJsonNumMultBy>("json.nummultby", 4, "write", 1, 1, 1),
+                        MakeCmdAttr<CommandJsonObjLen>("json.objlen", -2, "read-only", 1, 1, 1),
                         MakeCmdAttr<CommandJsonStrAppend>("json.strappend", -3, "write", 1, 1, 1),
                         MakeCmdAttr<CommandJsonStrLen>("json.strlen", -2, "read-only", 1, 1, 1), );
 

src/types/json.h

@@ -467,6 +467,22 @@ struct JsonValue {
     return Status::OK();
   }
 
+  Status ObjLen(std::string_view path, std::vector<std::optional<uint64_t>> &obj_lens) const {
+    try {
+      jsoncons::jsonpath::json_query(value, path,
+                                     [&obj_lens](const std::string & /*path*/, const jsoncons::json &basic_json) {
+                                       if (basic_json.is_object()) {
+                                         obj_lens.emplace_back(static_cast<uint64_t>(basic_json.size()));
+                                       } else {
+                                         obj_lens.emplace_back(std::nullopt);
+                                       }
+                                     });
+    } catch (const jsoncons::jsonpath::jsonpath_error &e) {
+      return {Status::NotOK, e.what()};
+    }
+    return Status::OK();
+  }
+
   StatusOr<std::vector<std::optional<JsonValue>>> ArrPop(std::string_view path, int64_t index = -1) {
     std::vector<std::optional<JsonValue>> popped_values;
 

src/types/redis_json.cc

@@ -501,4 +501,18 @@ rocksdb::Status Json::StrLen(const std::string &user_key, const std::string &pat
   return rocksdb::Status::OK();
 }
 
+rocksdb::Status Json::ObjLen(const std::string &user_key, const std::string &path,
+                             std::vector<std::optional<uint64_t>> &obj_lens) {
+  auto ns_key = AppendNamespacePrefix(user_key);
+  JsonMetadata metadata;
+  JsonValue json_val;
+  auto s = read(ns_key, &metadata, &json_val);
+  if (!s.ok()) return s;
+
+  auto len_res = json_val.ObjLen(path, obj_lens);
+  if (!len_res) return rocksdb::Status::InvalidArgument(len_res.Msg());
+
+  return rocksdb::Status::OK();
+}
+
 }  // namespace redis

src/types/redis_json.h

@@ -64,6 +64,8 @@ class Json : public Database {
   rocksdb::Status StrAppend(const std::string &user_key, const std::string &path, const std::string &value,
                             std::vector<uint64_t> &append_cnt);
   rocksdb::Status StrLen(const std::string &user_key, const std::string &path, std::vector<uint64_t> &lens);
+  rocksdb::Status ObjLen(const std::string &user_key, const std::string &path,
+                         std::vector<std::optional<uint64_t>> &obj_lens);
 
  private:
   rocksdb::Status write(Slice ns_key, JsonMetadata *metadata, const JsonValue &json_val);

tests/gocase/unit/type/json/json_test.go

@@ -554,4 +554,31 @@ func TestJson(t *testing.T) {
 			rdb.Do(ctx, "JSON.GET", "nested_arr_big_num").Val())
 	})
 
+	t.Run("JSON.OBJLEN basics", func(t *testing.T) {
+		require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"x":[3], "nested": {"x": {"y":2, "z": 1}}}`).Err())
+		vals, err := rdb.Do(ctx, "JSON.OBJLEN", "a", "$..x").Slice()
+		require.NoError(t, err)
+		require.EqualValues(t, 2, len(vals))
+		// the first `x` path is not an object, so it should return nil
+		require.EqualValues(t, nil, vals[0])
+		// the second `x` path is an object with two fields, so it should return 2
+		require.EqualValues(t, 2, vals[1])
+
+		vals, err = rdb.Do(ctx, "JSON.OBJLEN", "a", "$.nested").Slice()
+		require.NoError(t, err)
+		require.EqualValues(t, 1, len(vals))
+		require.EqualValues(t, 1, vals[0])
+
+		vals, err = rdb.Do(ctx, "JSON.OBJLEN", "a", "$").Slice()
+		require.NoError(t, err)
+		require.EqualValues(t, 1, len(vals))
+		require.EqualValues(t, 2, vals[0])
+
+		vals, err = rdb.Do(ctx, "JSON.OBJLEN", "a", "$.no_exists_path").Slice()
+		require.NoError(t, err)
+		require.EqualValues(t, 0, len(vals))
+
+		err = rdb.Do(ctx, "JSON.OBJLEN", "no-such-json-key", "$").Err()
+		require.EqualError(t, err, redis.Nil.Error())
+	})
 }