Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(json): JSON.MSET may update on the old json value #2579

Merged
merged 4 commits into from
Oct 5, 2024
Merged

fix(json): JSON.MSET may update on the old json value #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a16e38
fix: JSON.MSET multi-command query on a single key
poipoiPIO Oct 5, 2024
c4115a6
fix : format
poipoiPIO Oct 5, 2024
2af0d84
Code review requested changes
poipoiPIO Oct 5, 2024
00bec20
Requested fix : Remove const modifier from loop
poipoiPIO Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions src/types/redis_json.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

#include "redis_json.h"

#include <unordered_map>

#include "json.h"
#include "lock_manager.h"
#include "storage/redis_metadata.h"
Expand Down Expand Up @@ -573,6 +575,11 @@ rocksdb::Status Json::MSet(engine::Context &ctx, const std::vector<std::string>

auto batch = storage_->GetWriteBatchBase();
WriteBatchLogData log_data(kRedisJson);

// A single JSON key may be modified multiple times in the MSET command,
// so we need to record them temporarily to avoid reading old values from DB.
std::unordered_map<std::string, std::pair<JsonValue, JsonMetadata>> dirty_keys{};
poipoiPIO marked this conversation as resolved.
Show resolved Hide resolved

auto s = batch->PutLogData(log_data.Encode());
if (!s.ok()) return s;

Expand All @@ -583,18 +590,28 @@ rocksdb::Status Json::MSet(engine::Context &ctx, const std::vector<std::string>
JsonMetadata metadata;
JsonValue value;

if (auto s = read(ctx, ns_keys[i], &metadata, &value); s.IsNotFound()) {
if (paths[i] != "$") return rocksdb::Status::InvalidArgument("new objects must be created at the root");

value = *std::move(json_res);
} else {
if (!s.ok()) return s;

JsonValue new_val = *std::move(json_res);
auto set_res = value.Set(paths[i], std::move(new_val));
// If a key has been modified before, just read from memory to find the modified value.
if (dirty_keys.count(ns_keys[i])) {
poipoiPIO marked this conversation as resolved.
Show resolved Hide resolved
value = dirty_keys[ns_keys[i]].first;
auto set_res = value.Set(paths[i], *std::move(json_res));
if (!set_res) return rocksdb::Status::InvalidArgument(set_res.Msg());
} else {
if (auto s = read(ctx, ns_keys[i], &metadata, &value); s.IsNotFound()) {
if (paths[i] != "$") return rocksdb::Status::InvalidArgument("new objects must be created at the root");
value = *std::move(json_res);
} else {
if (!s.ok()) return s;

auto set_res = value.Set(paths[i], *std::move(json_res));
if (!set_res) return rocksdb::Status::InvalidArgument(set_res.Msg());
}
}

dirty_keys[ns_keys[i]] = std::make_pair(value, metadata);
}

for (auto &[ns_key, updated_object] : dirty_keys) {
auto &[value, metadata] = updated_object;
auto format = storage_->GetConfig()->json_storage_format;
metadata.format = format;

Expand All @@ -613,7 +630,7 @@ rocksdb::Status Json::MSet(engine::Context &ctx, const std::vector<std::string>
return rocksdb::Status::InvalidArgument("Failed to encode JSON into storage: " + res.Msg());
}

s = batch->Put(metadata_cf_handle_, ns_keys[i], val);
s = batch->Put(metadata_cf_handle_, ns_key, val);
if (!s.ok()) return s;
}

Expand Down
8 changes: 7 additions & 1 deletion tests/gocase/unit/type/json/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,13 @@ func testJSON(t *testing.T, configs util.KvrocksServerConfigs) {
EqualJSON(t, `[4]`, rdb.Do(ctx, "JSON.GET", "a1", "$.a").Val())
})

t.Run("JSON.MSET multi-command", func(t *testing.T) {
require.NoError(t, rdb.Do(ctx, "JSON.SET", "doc", "$", `{"f1":{"a1":0},"f2":{"a2":0}}`).Err())
require.NoError(t, rdb.Do(ctx, "JSON.MSET", "doc", "$.f1.a1", "1", "doc", "$.f2.a2", "2").Err())

EqualJSON(t, `{"f1":{"a1":1},"f2":{"a2":2}}`, rdb.Do(ctx, "JSON.GET", "doc").Val())
})

t.Run("JSON.DEBUG MEMORY basics", func(t *testing.T) {
require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"b":true,"x":1, "y":1.2, "z": {"x":[1,2,3], "y": null}, "v":{"x":"y"},"f":{"x":[]}}`).Err())
//object
Expand Down Expand Up @@ -712,7 +719,6 @@ func testJSON(t *testing.T, configs util.KvrocksServerConfigs) {
require.Equal(t, make([]interface{}, 0), rdb.Do(ctx, "JSON.RESP", "item:2", "$.a").Val())

})

}

func EqualJSON(t *testing.T, expected string, actual interface{}) {
Expand Down
Loading