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

feat(json): support JSON.GET pretty print options (#1832)

Browse source 
* parse json.get pretty print options

Signed-off-by: iko1 <me@remotecpp.dev>

* finalize json.get sub args
* set indent size to 1 & add unit tests cases

---------

Signed-off-by: iko1 <me@remotecpp.dev>
This commit is contained in:
iko1 2023-09-24 16:40:13 +02:00 • committed by GitHub
parent bb77de7551
commit 19783face5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 211 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/server/json_family.cc
View file

@ -390,7 +390,8 @@ void SendJsonValue(ConnectionContext* cntx, const JsonType& j) {
}
OpResult<string> OpGet(const OpArgs& op_args, string_view key,
vector<pair<string_view, JsonExpression>> expressions) {
vector<pair<string_view, JsonExpression>> expressions, bool should_format,
const OptString& indent, const OptString& new_line, const OptString& space) {
OpResult<JsonType*> result = GetJson(op_args, key);
if (!result) {
return result.status();
@ -402,8 +403,39 @@ OpResult<string> OpGet(const OpArgs& op_args, string_view key,
// means we just brings all values
return json_entry.to_string();
}
json_options options;
if (should_format) {
options.spaces_around_comma(spaces_option::no_spaces)
.spaces_around_colon(spaces_option::no_spaces)
.object_array_line_splits(line_split_kind::multi_line)
.indent_size(1)
.new_line_chars("");
if (indent) {
options.indent_chars(*indent);
} else {
options.indent_size(0);
}
if (new_line) {
options.new_line_chars(*new_line);
}
if (space) {
options.after_key_chars(*space);
}
}
if (expressions.size() == 1) {
json out = expressions[0].second.evaluate(json_entry);
if (should_format) {
json_printable jp(out, options, indenting::indent);
std::stringstream ss;
jp.dump(ss);
return ss.str();
}
return out.as<string>();
}
@ -413,6 +445,13 @@ OpResult<string> OpGet(const OpArgs& op_args, string_view key,
out[expr.first] = eval;
}
if (should_format) {
json_printable jp(out, options, indenting::indent);
std::stringstream ss;
jp.dump(ss);
return ss.str();
}
return out.as<string>();
}
@ -1748,22 +1787,52 @@ void JsonFamily::Get(CmdArgList args, ConnectionContext* cntx) {
DCHECK_GE(args.size(), 1U);
string_view key = ArgS(args, 0);
OptString indent;
OptString new_line;
OptString space;
vector<pair<string_view, JsonExpression>> expressions;
for (size_t i = 1; i < args.size(); ++i) {
string_view path = ArgS(args, i);
string_view param = ArgS(args, i);
if (absl::EqualsIgnoreCase(param, "space")) {
if (++i >= args.size()) {
return (*cntx)->SendError(facade::WrongNumArgsError(cntx->cid->name()),
facade::kSyntaxErrType);
} else {
space = ArgS(args, i);
continue;
}
} else if (absl::EqualsIgnoreCase(param, "newline")) {
if (++i >= args.size()) {
return (*cntx)->SendError(facade::WrongNumArgsError(cntx->cid->name()),
facade::kSyntaxErrType);
} else {
new_line = ArgS(args, i);
continue;
}
} else if (absl::EqualsIgnoreCase(param, "indent")) {
if (++i >= args.size()) {
return (*cntx)->SendError(facade::WrongNumArgsError(cntx->cid->name()),
facade::kSyntaxErrType);
} else {
indent = ArgS(args, i);
continue;
}
}
error_code ec;
JsonExpression expr = ParseJsonPath(path, &ec);
JsonExpression expr = ParseJsonPath(param, &ec);
if (ec) {
LOG(WARNING) << "path '" << path << "': Invalid JSONPath syntax: " << ec.message();
LOG(WARNING) << "path '" << param << "': Invalid JSONPath syntax: " << ec.message();
return (*cntx)->SendError(kSyntaxErr);
}
expressions.emplace_back(path, move(expr));
expressions.emplace_back(param, move(expr));
}
bool should_format = (indent || new_line || space);
auto cb = [&](Transaction* t, EngineShard* shard) {
return OpGet(t->GetOpArgs(shard), key, move(expressions));
return OpGet(t->GetOpArgs(shard), key, move(expressions), should_format, indent, new_line,
space);
};
Transaction* trans = cntx->transaction;