mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 10:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat: Support non-root paths for json.merge (#3419)

Browse source 
* feat: Support non-root paths for json.merge

Pass path argument and rewrite the JSON.MERGE code similar to OpToggle
or other mutating functions. Currently works only with --experimental_flat_json=false.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>

* chore: comments

---------

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-08-01 11:33:36 +03:00 • committed by GitHub
parent 0ad310717d
commit a0918de2d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 63 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/server/json_family.cc
View file

@ -1451,39 +1451,42 @@ OpStatus OpMSet(const OpArgs& op_args, const ShardArgs& args) {
return result;
}
OpStatus OpMerge(const OpArgs& op_args, string_view key, std::string_view json_str) {
// Note that currently OpMerge works only with jsoncons and json::Path support has not been
// implemented yet.
OpStatus OpMerge(const OpArgs& op_args, string_view key, JsonPathV2 expression, string_view path,
std::string_view json_str) {
std::optional<JsonType> parsed_json = JsonFromString(json_str);
if (!parsed_json) {
VLOG(1) << "got invalid JSON string '" << json_str << "' cannot be saved";
return OpStatus::SYNTAX_ERR;
}
auto& db_slice = op_args.GetDbSlice();
auto it_res = db_slice.FindMutable(op_args.db_cntx, key, OBJ_JSON);
if (it_res.ok()) {
op_args.shard->search_indices()->RemoveDoc(key, op_args.db_cntx, it_res->it->second);
auto cb = [&](optional<string_view> cur_path, JsonType* val) {
string_view strpath = cur_path ? *cur_path : string_view{};
JsonType* obj = it_res->it->second.GetJson();
DVLOG(2) << "Handling " << strpath << " " << val->to_string();
// https://datatracker.ietf.org/doc/html/rfc7386#section-2
try {
// https://datatracker.ietf.org/doc/html/rfc7386#section-2
mergepatch::apply_merge_patch(*obj, *parsed_json);
mergepatch::apply_merge_patch(*val, *parsed_json);
} catch (const std::exception& e) {
LOG_EVERY_T(ERROR, 1) << "Exception in OpMerge: " << e.what() << " with obj: " << *obj
<< " and patch: " << *parsed_json;
return OpStatus::INVALID_VALUE;
LOG_EVERY_T(ERROR, 1) << "Exception in OpMerge: " << e.what() << " with obj: " << *val
<< " and patch: " << *parsed_json << ", path: " << strpath;
return false;
}
it_res->post_updater.Run();
op_args.shard->search_indices()->AddDoc(key, op_args.db_cntx, it_res->it->second);
return OpStatus::OK;
}
// We add a new key only with path being root.
if (it_res.status() != OpStatus::KEY_NOTFOUND) {
return it_res.status();
}
return false;
};
// Add a new key.
return OpSet(op_args, key, "$", json_str, false, false).status();
OpStatus status = UpdateEntry(op_args, key, path, cb);
if (status != OpStatus::KEY_NOTFOUND)
return status;
if (path == "$") {
// Add a new key.
return OpSet(op_args, key, "$", json_str, false, false).status();
}
return OpStatus::SYNTAX_ERR;
}
io::Result<JsonPathV2, string> ParsePathV2(string_view path) {
@ -1591,12 +1594,10 @@ void JsonFamily::Merge(CmdArgList args, ConnectionContext* cntx) {
string_view path = ArgS(args, 1);
string_view value = ArgS(args, 2);
if (path != "." && path != "$") {
return cntx->SendError("Only root path is supported", kSyntaxErrType);
}
JsonPathV2 expression = PARSE_PATHV2(path);
auto cb = [&](Transaction* t, EngineShard* shard) {
return OpMerge(t->GetOpArgs(shard), key, value);
return OpMerge(t->GetOpArgs(shard), key, std::move(expression), path, value);
};
OpStatus status = cntx->transaction->ScheduleSingleHop(cb);