mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly synced 2024-11-22 15:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow integer tokens in search queries (#1701)

Browse Source 
Signed-off-by: Vladislav Oleshko <vlad@dragonflydb.io>
This commit is contained in:
Vladislav 2023-08-16 16:25:49 +03:00 committed by GitHub
parent 773cee12f4
commit 66e11de274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/search/parser.y
View File

@ -92,10 +92,14 @@ search_expr:
| search_expr OR_OP search_expr { $$ = AstLogicalNode(move($1), move($3), AstLogicalNode::OR); }
| NOT_OP search_expr { $$ = AstNegateNode(move($2)); }
| TERM { $$ = AstTermNode(move($1)); }
| INT64 { $$ = AstTermNode(to_string($1)); }
| FIELD COLON field_cond { $$ = AstFieldNode(move($1), move($3)); }
// field_cond doesn't implicitly turn into field_cond_expr that can contain multi-term and/or expressions,
// as those can only be contained inside parentheses
field_cond:
TERM { $$ = AstTermNode(move($1)); }
| INT64 { $$ = AstTermNode(to_string($1)); }
| NOT_OP field_cond { $$ = AstNegateNode(move($2)); }
| LPAREN field_cond_expr RPAREN { $$ = move($2); }
| LBRACKET INT64 INT64 RBRACKET { $$ = AstRangeNode(move($2), move($3)); }
@ -107,10 +111,13 @@ field_cond_expr:
| field_cond_expr OR_OP field_cond_expr { $$ = AstLogicalNode(move($1), move($3), AstLogicalNode::OR); }
| NOT_OP field_cond_expr { $$ = AstNegateNode(move($2)); };
| TERM { $$ = AstTermNode(move($1)); }
| INT64 { $$ = AstTermNode(to_string($1)); }
tag_list:
TERM { $$ = AstTagsNode(move($1)); }
| INT64 { $$ = AstTagsNode(to_string($1)); }
| tag_list OR_OP TERM { $$ = AstTagsNode(move($1), move($3)); }
| tag_list OR_OP INT64 { $$ = AstTagsNode(move($1), to_string($3)); }
%%

11
src/core/search/search_test.cc
View File

@ -315,6 +315,17 @@ TEST_F(SearchParserTest, CheckTag) {
EXPECT_TRUE(Check()) << GetError();
}
TEST_F(SearchParserTest, IntegerTerms) {
PrepareSchema({{{"status", Schema::TAG}, {"title", Schema::TEXT}}});
PrepareQuery("@status:{1} @title:33");
ExpectAll(Map{{"status", "1"}, {"title", "33 cars on the road"}});
ExpectNone(Map{{"status", "0"}, {"title", "22 trains on the tracks"}});
EXPECT_TRUE(Check()) << GetError();
}
TEST_F(SearchParserTest, SimpleKnn) {
Schema schema{{{"even", Schema::TAG}, {"pos", Schema::VECTOR}}};
FieldIndices indices{schema};