From 3ef1fe78cb3fd8211afbb04930fcc5add48d62ff Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 14 Nov 2026 17:40:59 -0800 Subject: [PATCH 1/2] Cache path depths for mutation ordering Signed-off-by: Guy Korland Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/json/dom.cc | 14 ++++++++------ tst/unit/dom_test.cc | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/json/dom.cc b/src/json/dom.cc index a6396ad..a9deef0 100644 --- a/src/json/dom.cc +++ b/src/json/dom.cc @@ -43,7 +43,7 @@ RapidJsonAllocator allocator; /** * Order a unique result set deepest first, using most '/' separators. - * Ties retain original relative order via stable sort. + * Path depths are computed once; ties retain original relative order via stable sort. * * A size changing mutation on an array invalidates cached JValue* * pointers to its elements. Acting on descendants before ancestors ensures @@ -54,11 +54,13 @@ RapidJsonAllocator allocator; */ STATIC jsn::vector order_result_set_deepest_first(const jsn::vector &rs) { jsn::vector order(rs.size()); - for (size_t i = 0; i < rs.size(); i++) order[i] = i; - std::stable_sort(order.begin(), order.end(), [&rs](size_t a, size_t b) { - size_t depth_a = std::count(rs[a].second.begin(), rs[a].second.end(), '/'); - size_t depth_b = std::count(rs[b].second.begin(), rs[b].second.end(), '/'); - return depth_a > depth_b; // deeper paths first + jsn::vector depths(rs.size()); + for (size_t i = 0; i < rs.size(); i++) { + order[i] = i; + depths[i] = std::count(rs[i].second.begin(), rs[i].second.end(), '/'); + } + std::stable_sort(order.begin(), order.end(), [&depths](size_t a, size_t b) { + return depths[a] > depths[b]; // deeper paths first }); return order; } diff --git a/tst/unit/dom_test.cc b/tst/unit/dom_test.cc index f70f107..fc5c3e0 100644 --- a/tst/unit/dom_test.cc +++ b/tst/unit/dom_test.cc @@ -54,6 +54,7 @@ size_t cobsize(ValkeyModuleCtx *) { } extern size_t hash_function(const char *, size_t); +extern jsn::vector order_result_set_deepest_first(const jsn::vector &rs); /* Since unit tests run outside of Valkey server, we need to map Valkey' * memory management functions to cstdlib functions. */ @@ -163,6 +164,27 @@ class DomTest : public ::testing::Test { } }; +TEST_F(DomTest, testMutationOrderDeepestFirstStable) { + const jsn::vector rs = { + {nullptr, ""}, + {nullptr, "/a"}, + {nullptr, "/a/b/c"}, + {nullptr, "/d/e"}, + {nullptr, "/f~1g/h~0i"}, + {nullptr, "/j"}, + {nullptr, "/k/l/m"} + }; + const jsn::vector expected = {2, 6, 3, 4, 1, 5, 0}; + EXPECT_EQ(order_result_set_deepest_first(rs), expected); +} + +TEST_F(DomTest, testMutationOrderEmptyAndSingleton) { + EXPECT_TRUE(order_result_set_deepest_first({}).empty()); + const jsn::vector rs = {{nullptr, ""}}; + const jsn::vector expected = {0}; + EXPECT_EQ(order_result_set_deepest_first(rs), expected); +} + TEST_F(DomTest, testParseObject) { JDocument *doc; JsonUtilCode rc = dom_parse(nullptr, json1, strlen(json1), &doc); From 7e27d338af16bb426fb8b0af66fa61e633032f33 Mon Sep 17 00:00:00 2001 From: Guy Korland Date: Sat, 14 Nov 2026 17:51:51 -0800 Subject: [PATCH 2/2] Avoid depth allocation and path scan for singleton result sets Signed-off-by: Guy Korland Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/json/dom.cc | 4 ++++ tst/unit/dom_test.cc | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/json/dom.cc b/src/json/dom.cc index a9deef0..eabf074 100644 --- a/src/json/dom.cc +++ b/src/json/dom.cc @@ -54,6 +54,10 @@ RapidJsonAllocator allocator; */ STATIC jsn::vector order_result_set_deepest_first(const jsn::vector &rs) { jsn::vector order(rs.size()); + if (rs.size() <= 1) { + if (rs.size() == 1) order[0] = 0; + return order; + } jsn::vector depths(rs.size()); for (size_t i = 0; i < rs.size(); i++) { order[i] = i; diff --git a/tst/unit/dom_test.cc b/tst/unit/dom_test.cc index fc5c3e0..2da9307 100644 --- a/tst/unit/dom_test.cc +++ b/tst/unit/dom_test.cc @@ -180,9 +180,11 @@ TEST_F(DomTest, testMutationOrderDeepestFirstStable) { TEST_F(DomTest, testMutationOrderEmptyAndSingleton) { EXPECT_TRUE(order_result_set_deepest_first({}).empty()); - const jsn::vector rs = {{nullptr, ""}}; + const jsn::vector root_rs = {{nullptr, ""}}; + const jsn::vector nested_rs = {{nullptr, "/a/b/c"}}; const jsn::vector expected = {0}; - EXPECT_EQ(order_result_set_deepest_first(rs), expected); + EXPECT_EQ(order_result_set_deepest_first(root_rs), expected); + EXPECT_EQ(order_result_set_deepest_first(nested_rs), expected); } TEST_F(DomTest, testParseObject) {