fix(json): JSON.DEL recursive descent duplicate counting for nested same-key elements #5312
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vyavdoshenko
changed the title
vyavdoshenko
changed the title
romange
reviewed
Jun 17, 2025
| @@ -1261,6 +1261,24 @@ TEST_F(JsonFamilyTest, Del) { | |||
|
|
|||
| resp = Run({"JSON.GET", "json"}); | |||
| EXPECT_THAT(resp, ArgType(RespExpr::NIL)); | |||
|
|
|||
| if (absl::GetFlag(FLAGS_jsonpathv2)) { | |||
There was a problem hiding this comment.
can you please add a test in jsonpath_test.cc as well?
There was a problem hiding this comment.
The unit test was added to jsonpath_test.cc
romange
reviewed
Jun 17, 2025
romange
reviewed
Jun 18, 2025
src/core/json/detail/jsoncons_dfs.cc
Outdated
| stack.emplace_back(json); | ||
|
|
||
| // Collect nodes to delete - but simplified without complex filtering | ||
| std::vector<JsonType*> nodes_to_delete; |
There was a problem hiding this comment.
why do we need nodes_to_delete ? what exactly breaks if you delete during the traversal?
romange
reviewed
Jun 18, 2025
src/core/json/detail/jsoncons_dfs.cc
Outdated
| } while (!stack.empty()); | ||
|
|
||
| // Apply deletions with filtering for recursive descent to avoid parent-child duplication | ||
| const PathSegment& terminal_segment = path.back(); |
There was a problem hiding this comment.
if we delete immediately without nodes_to_delete, we won't need all this code below, since if we delete parent first, we won't traverse its children.
There was a problem hiding this comment.
Yes, it seems, you are exactly right.
romange
approved these changes
Jun 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #5259
Issue:
JSON.DEL doc "$..a"was returning 2 instead of 1 when deleting nested objects with the same key name, because both parent and child deletions were counted separately.Solution:
Added filtering logic to avoid counting child nodes that are automatically deleted when their parent is removed. Only applies to recursive descent deletion operations where one object directly contains another with the same target key.
Testing:
poetry run pytest -s test/test_json/test_json.py -k test_json_delete_with_dollar