Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions src/json/dom.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -54,11 +54,17 @@ RapidJsonAllocator allocator;
*/
STATIC jsn::vector<size_t> order_result_set_deepest_first(const jsn::vector<Selector::ValueInfo> &rs) {
jsn::vector<size_t> 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
if (rs.size() <= 1) {
if (rs.size() == 1) order[0] = 0;
return order;
}
jsn::vector<size_t> 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;
}
Expand Down
24 changes: 24 additions & 0 deletions tst/unit/dom_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ size_t cobsize(ValkeyModuleCtx *) {
}

extern size_t hash_function(const char *, size_t);
extern jsn::vector<size_t> order_result_set_deepest_first(const jsn::vector<Selector::ValueInfo> &rs);

/* Since unit tests run outside of Valkey server, we need to map Valkey'
* memory management functions to cstdlib functions. */
Expand Down Expand Up @@ -163,6 +164,29 @@ class DomTest : public ::testing::Test {
}
};

TEST_F(DomTest, testMutationOrderDeepestFirstStable) {
const jsn::vector<Selector::ValueInfo> 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<size_t> 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<Selector::ValueInfo> root_rs = {{nullptr, ""}};
const jsn::vector<Selector::ValueInfo> nested_rs = {{nullptr, "/a/b/c"}};
const jsn::vector<size_t> expected = {0};
EXPECT_EQ(order_result_set_deepest_first(root_rs), expected);
EXPECT_EQ(order_result_set_deepest_first(nested_rs), expected);
}

TEST_F(DomTest, testParseObject) {
JDocument *doc;
JsonUtilCode rc = dom_parse(nullptr, json1, strlen(json1), &doc);
Expand Down