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(json_family): Fix JsonFromString method (#3602)

Browse source 
Signed-off-by: Stepan Bagritsevich <stefan@dragonflydb.io>
This commit is contained in:
Stepan Bagritsevich 2024-08-30 18:39:25 +02:00 committed by GitHub
parent dd0effac6f
commit 31463c288d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/server/json_family.cc
View file

@ -250,7 +250,13 @@ string JsonTypeToName(const JsonType& val) {
return std::string{};
}
inline std::optional<JsonType> JsonFromString(std::string_view input) {
// Use this method on the coordinator thread
std::optional<JsonType> JsonFromString(std::string_view input) {
return dfly::JsonFromString(input, PMR_NS::get_default_resource());
}
// Use this method on the shard thread
std::optional<JsonType> ShardJsonFromString(std::string_view input) {
return dfly::JsonFromString(input, CompactObj::memory_resource());
}
@ -1142,7 +1148,7 @@ auto OpResp(const OpArgs& op_args, string_view key, const WrappedJsonPath& json_
OpResult<bool> OpSet(const OpArgs& op_args, string_view key, string_view path,
const WrappedJsonPath& json_path, std::string_view json_str,
bool is_nx_condition, bool is_xx_condition) {
std::optional<JsonType> parsed_json = JsonFromString(json_str);
std::optional<JsonType> parsed_json = ShardJsonFromString(json_str);
if (!parsed_json) {
VLOG(1) << "got invalid JSON string '" << json_str << "' cannot be saved";
return OpStatus::SYNTAX_ERR;
@ -1268,7 +1274,7 @@ OpStatus OpMerge(const OpArgs& op_args, string_view key, string_view path,
const WrappedJsonPath& json_path, std::string_view json_str) {
// DCHECK(!json_path.HoldsJsonPath());
std::optional<JsonType> parsed_json = JsonFromString(json_str);
std::optional<JsonType> parsed_json = ShardJsonFromString(json_str);
if (!parsed_json) {
VLOG(1) << "got invalid JSON string '" << json_str << "' cannot be saved";
return OpStatus::SYNTAX_ERR;
@ -1475,8 +1481,7 @@ void JsonFamily::ArrIndex(CmdArgList args, ConnectionContext* cntx) {
WrappedJsonPath json_path = GET_OR_SEND_UNEXPECTED(ParseJsonPath(path));
optional<JsonType> search_value =
dfly::JsonFromString(ArgS(args, 2), PMR_NS::get_default_resource());
optional<JsonType> search_value = JsonFromString(ArgS(args, 2));
if (!search_value) {
cntx->SendError(kSyntaxErr);
return;
@ -1656,7 +1661,7 @@ void JsonFamily::StrAppend(CmdArgList args, ConnectionContext* cntx) {
WrappedJsonPath json_path = GET_OR_SEND_UNEXPECTED(ParseJsonPath(path));
// We try parsing the value into json string object first.
optional<JsonType> parsed_json = dfly::JsonFromString(value, PMR_NS::get_default_resource());
optional<JsonType> parsed_json = JsonFromString(value);
if (!parsed_json || !parsed_json->is_string()) {
return cntx->SendError("expected string value", kSyntaxErrType);
};