Skip to content

Commit e01703d

Browse files
svilen-mihaylov-elasticafoucret
authored andcommitted
[ES|QL] Prevent using unnamed fields in the RERANK command (elastic#127416)
1 parent 999ffac commit e01703d

File tree

13 files changed

+1394
-1126
lines changed

13 files changed

+1394
-1126
lines changed

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,14 @@ field
136136
: (qualifiedName ASSIGN)? booleanExpression
137137
;
138138

139+
rerankFields
140+
: rerankField (COMMA rerankField)*
141+
;
142+
143+
rerankField
144+
: qualifiedName (ASSIGN booleanExpression)?
145+
;
146+
139147
fromCommand
140148
: FROM indexPattern (COMMA indexPattern)* metadata?
141149
;
@@ -370,7 +378,7 @@ joinPredicate
370378
;
371379

372380
rerankCommand
373-
: DEV_RERANK queryText=constant ON fields WITH inferenceId=identifierOrParameter
381+
: DEV_RERANK queryText=constant ON rerankFields WITH inferenceId=identifierOrParameter
374382
;
375383

376384
completionCommand

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)