fix(search_family): Add options test for the FT.AGGREGATE command #4479
+211
−143
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
5 tasks
Signed-off-by: Stepan Bagritsevich <[email protected]>
Signed-off-by: Stepan Bagritsevich <[email protected]>
Signed-off-by: Stepan Bagritsevich <[email protected]>
Signed-off-by: Stepan Bagritsevich <[email protected]>
BagritsevichStepan
force-pushed
the
search/ft-aggregate-add-option-tests
branch
from
e1d3c11 to
3570612
Compare
BorysTheDev
reviewed
Jan 31, 2025
| @@ -119,7 +119,7 @@ struct CmdArgParser { | |||
|
|
|||
| // Check if the next value is equal to a specific tag. If equal, its consumed. | |||
| template <class... Args> bool Check(std::string_view tag, Args*... args) { | |||
| if (cur_i_ + sizeof...(Args) >= args_.size()) | |||
| if (cur_i_ + sizeof...(Args) >= args_.size() || error_) | |||
BorysTheDev
reviewed
Jan 31, 2025
Comment on lines
+43
to
+49
| nonstd::unexpected_type<ErrorReply> CreateSyntaxError(std::string message) { | ||
| return make_unexpected(ErrorReply{std::move(message), kSyntaxErrType}); | ||
| } | ||
|
|
||
| nonstd::unexpected_type<ErrorReply> CreateSyntaxError(std::string_view message) { | ||
| return make_unexpected(ErrorReply{message, kSyntaxErrType}); | ||
| } |
There was a problem hiding this comment.
implementation of these functions is shorter than their names, I don't think that you need them
BorysTheDev
reviewed
Jan 31, 2025
Comment on lines
+177
to
+178
| while (parser->HasNext()) { | ||
| if (parser->Check("NOINDEX")) { |
There was a problem hiding this comment.
maybe we can use here TryMapNext
BorysTheDev
reviewed
Jan 31, 2025
| builder->SendError(err->MakeReply()); | ||
| return nullopt; | ||
| } | ||
| auto type = parser->MapNext("TAG"sv, SchemaField::TAG, "TEXT"sv, SchemaField::TEXT, "NUMERIC"sv, |
There was a problem hiding this comment.
Consider instead of SchemaField type use function pointer
std::pair<SchemaField, search::SchemaField::ParamsVariant> (*f)(CmdArgParser*)
BorysTheDev
reviewed
Jan 31, 2025
Comment on lines
+212
to
+246
| while (parser->HasNext()) { | ||
| // ON HASH | JSON | ||
| if (parser->Check("ON")) { | ||
| index.type = parser->MapNext("HASH"sv, DocIndex::HASH, "JSON"sv, DocIndex::JSON); | ||
| continue; | ||
| } | ||
|
|
||
| // PREFIX count prefix [prefix ...] | ||
| if (parser->Check("PREFIX")) { | ||
| if (!parser->Check("1")) | ||
| return CreateSyntaxError("Multiple prefixes are not supported"sv); | ||
| index.prefix = string(parser->Next()); | ||
| continue; | ||
| } | ||
|
|
||
| // STOWORDS count [words...] | ||
| if (parser->Check("STOPWORDS")) { | ||
| index.options.stopwords.clear(); | ||
| for (size_t num = parser->Next<size_t>(); num > 0; num--) | ||
| index.options.stopwords.emplace(parser->Next()); | ||
| continue; | ||
| } | ||
|
|
||
| // SCHEMA | ||
| if (parser->Check("SCHEMA")) { | ||
| auto schema = ParseSchema(index.type, parser); | ||
| if (!schema) | ||
| return make_unexpected(schema.error()); | ||
| index.schema = std::move(*schema); | ||
| break; // SCHEMA always comes last | ||
| } | ||
|
|
||
| // Unsupported parameters are ignored for now | ||
| parser->Skip(1); | ||
| } |
There was a problem hiding this comment.
Consider using tryMapNext and return function that can parse the next args
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.
related to the #4204
It was a bad decision to use it because, in some cases, we were returning an error with
builder->SendError(...). However, in those cases, we were not handling parser errors withparser->Error(). As a result, debug builds were crashing because of this check:Now, we ensure that parsing errors are processed in all cases.
3. Add options test for the
FT.AGGREGATEcommand