mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

fix: support json v1 dot path (#1462)

Browse source 
Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
This commit is contained in:
Vladislav 2023-06-22 14:38:30 +03:00 committed by GitHub
parent 10479a4fba
commit dc5ec628e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/server/json_family.cc
View file

@ -84,6 +84,16 @@ string JsonTypeToName(const JsonType& val) {
return std::string{};
}
JsonExpression ParseJsonPath(string_view path, error_code* ec) {
if (path == ".") {
// RedisJson V1 uses the dot for root level access.
// There are more incompatibilities with legacy paths which are not supported.
path = "$"sv;
}
return jsonpath::make_expression<JsonType>(path, *ec);
}
template <typename T>
void PrintOptVec(ConnectionContext* cntx, const OpResult<vector<optional<T>>>& result) {
if (result->empty()) {
@ -1131,7 +1141,7 @@ void JsonFamily::Resp(CmdArgList args, ConnectionContext* cntx) {
}
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1184,7 +1194,7 @@ void JsonFamily::Debug(CmdArgList args, ConnectionContext* cntx) {
error_code ec;
string_view key = ArgS(args, 1);
string_view path = ArgS(args, 2);
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1211,7 +1221,7 @@ void JsonFamily::MGet(CmdArgList args, ConnectionContext* cntx) {
error_code ec;
string_view path = ArgS(args, args.size() - 1);
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1225,7 +1235,7 @@ void JsonFamily::MGet(CmdArgList args, ConnectionContext* cntx) {
auto cb = [&](Transaction* t, EngineShard* shard) {
ShardId sid = shard->shard_id();
mget_resp[sid] = OpMGet(jsonpath::make_expression<JsonType>(path, ec), t, shard);
mget_resp[sid] = OpMGet(ParseJsonPath(path, &ec), t, shard);
return OpStatus::OK;
};
@ -1267,7 +1277,7 @@ void JsonFamily::ArrIndex(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1435,7 +1445,7 @@ void JsonFamily::ArrPop(CmdArgList args, ConnectionContext* cntx) {
}
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1509,7 +1519,7 @@ void JsonFamily::ObjKeys(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1627,7 +1637,7 @@ void JsonFamily::Type(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1663,7 +1673,7 @@ void JsonFamily::ArrLen(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1690,7 +1700,7 @@ void JsonFamily::ObjLen(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1717,7 +1727,7 @@ void JsonFamily::StrLen(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
error_code ec;
JsonExpression expression = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expression = ParseJsonPath(path, &ec);
if (ec) {
VLOG(1) << "Invalid JSONPath syntax: " << ec.message();
@ -1748,7 +1758,7 @@ void JsonFamily::Get(CmdArgList args, ConnectionContext* cntx) {
for (size_t i = 1; i < args.size(); ++i) {
string_view path = ArgS(args, i);
error_code ec;
JsonExpression expr = jsonpath::make_expression<JsonType>(path, ec);
JsonExpression expr = ParseJsonPath(path, &ec);
if (ec) {
LOG(WARNING) << "path '" << path << "': Invalid JSONPath syntax: " << ec.message();

11
src/server/json_family_test.cc
View file

@ -1005,4 +1005,15 @@ TEST_F(JsonFamilyTest, Set) {
EXPECT_EQ(resp, R"([{"a":2,"b":8,"c":[1,2,3]}])");
}
TEST_F(JsonFamilyTest, LegacyV1) {
string json = R"({"key":[1,2,3,4]})";
auto resp = Run({"JSON.SET", "json1", ".", json});
EXPECT_THAT(resp, "OK");
// JSON.GET key "." is the same as JSON.GET key "$"
resp = Run({"JSON.GET", "json1", "."});
EXPECT_THAT(resp, absl::StrCat("[", json, "]"));
}
} // namespace dfly