Redesign FT.SEARCH command line parsing in anticipation of merging with future FT.AGGREGATE code. #29
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
yairgott
requested changes
Feb 4, 2025
.vscode/settings.json
Outdated
| @@ -5,7 +5,7 @@ | |||
| "clangd.path": "/usr/bin/clangd", | |||
| "C_Cpp.codeAnalysis.runAutomatically": true, | |||
| "editor.formatOnSave": true, | |||
| "C_Cpp.intelliSenseEngine": "disabled", | |||
| "C_Cpp.intelliSenseEngine": "default", | |||
There was a problem hiding this comment.
would this enable intelliSenseEngine checks? what is the benefit of setting it to "default" and would it conflict with clang-tidy?
There was a problem hiding this comment.
oops. not sure what happened there. I didn't check that.
| query::VectorSearchParameters ¶meters, absl::string_view source) { | ||
| if (source.empty() || source[0] != '$') { | ||
| return source; | ||
| } else { |
There was a problem hiding this comment.
nit- here and in other places, no need to use else when the if section alway returns. It would avoid the need to indent
src/commands/ft_search_parser.cc
Outdated
| itr.Next(); | ||
| absl::string_view key = vmsdk::ToStringView(key_str); | ||
| absl::string_view value = vmsdk::ToStringView(value_str); | ||
| if (parameters.parse_vars.params.find(key) != |
There was a problem hiding this comment.
Better to call parameters.parse_vars.params.insert(key, std::make_pair(0, value)) and if the key already exists, the success would be false.
allenss-amazon
force-pushed
the
allenss-fix-params
branch
from
31e4fe6 to
14a28df
Compare
yairgott
reviewed
Feb 5, 2025
.vscode/settings.json
Outdated
| @@ -19,4 +19,8 @@ | |||
| "bazel.buildifierFixOnFormat": false, | |||
| "clangd.inactiveRegions.useBackgroundHighlight": true, | |||
| "clangd.enableCodeCompletion": true, | |||
| "files.associations": { | |||
There was a problem hiding this comment.
No, and I diffed my PR against main and it showed no changes in this file. :( :( :(
future FT.AGGREGATE code. Signed-off-by: Allen Samuels <[email protected]>
Signed-off-by: Allen Samuels <[email protected]>
Signed-off-by: Allen Samuels <[email protected]>
allenss-amazon
force-pushed
the
allenss-fix-params
branch
from
23ae1b0 to
597210c
Compare
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.
Previously, the command line was parsed up to the query string. The parse of the query string had the side effect of identifying all $param substitution variables. This list was then used to generate a custom key/value parser which was then combined with the other processing clauses to finish parsing of the command line.
Now, the parsing of the query string is performed after the parsing of the entire command line. The major change here is that instead of creating a custom key/value parser that only recognized the $param substitution variables a generic hash-map of the substitution variables is generated in the first pass. During the subsequent parsing of the query string, the various places where a $param substitution is allowed is done by looking up the value in the generated hash map.
At the end of the parsing, (Verify), the hash map is walked to ensure that every $param was used at least once.
The new code will also reject an attempt to define the same $param twice. The old code would silently accept this and use the last value.