chore: fully switch to dual parsing with json::Path #2654
Merged
Conversation
This file contains 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
Signed-off-by: Roman Gershman <roman@dragonflydb.io>
BorysTheDev
reviewed
Feb 24, 2024
Comment on lines
+605
to
608
| if (status != OpStatus::OK) { | ||
| return status; | ||
| } | ||
| return vec; |
There was a problem hiding this comment.
ternary operator requires all the returned expressions be of the same type, which makes it less elegant here
BorysTheDev
reviewed
Feb 24, 2024
| } | ||
| size_t removal_index; | ||
| if (index < 0) { | ||
| int temp_index = index + val->size(); |
There was a problem hiding this comment.
can it really be negative?
There was a problem hiding this comment.
yes, like with python arrays
BorysTheDev
reviewed
Feb 24, 2024
Comment on lines
+824
to
+838
| if (std::holds_alternative<json::Path>(expression)) { | ||
| const json::Path& json_path = std::get<json::Path>(expression); | ||
| auto cb = [&vec, index](optional<string_view>, JsonType* val) { | ||
| ArrayPop(nullopt, index, val, &vec); | ||
| return false; | ||
| }; | ||
| status = UpdateEntry(op_args, key, json_path, std::move(cb)); | ||
| } else { | ||
| auto cb = [&](const auto& path, JsonType& val) { | ||
| ArrayPop(nullopt, index, &val, &vec); | ||
| return false; | ||
| }; | ||
|
|
||
| status = UpdateEntry(op_args, key, path, cb); | ||
| } |
There was a problem hiding this comment.
please consider to make one callback, because they are the same and you can use some type deduction to create one common type for JsonType
There was a problem hiding this comment.
these c++ gymnastics here are not worth it - the code is transitional and we will remove JsonExpression once everyone will be handled by json::Path spend some time released
BorysTheDev
approved these changes
Feb 24, 2024
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.
No description provided.