Skip to content

Commit 5e59ab5

Browse files
authored
ESQL: Fix grammar changes around per agg filtering (#114848)
Remove dev flag left in grammar for agg filtering Related to #113735
1 parent 3af4d67 commit 5e59ab5

File tree

7 files changed

+1319
-1336
lines changed

7 files changed

+1319
-1336
lines changed

docs/changelog/114848.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114848
2+
summary: "ESQL: Fix grammar changes around per agg filtering"
3+
area: ES|QL
4+
type: bug
5+
issues: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ SLASH : '/';
209209
PERCENT : '%';
210210

211211
MATCH : 'match';
212-
NESTED_WHERE : {this.isDevVersion()}? WHERE -> type(WHERE);
212+
NESTED_WHERE : WHERE -> type(WHERE);
213213

214214
NAMED_OR_POSITIONAL_PARAM
215215
: PARAM (LETTER | UNDERSCORE) UNQUOTED_ID_BODY*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ aggFields
173173
;
174174

175175
aggField
176-
: field {this.isDevVersion()}? (WHERE booleanExpression)?
176+
: field (WHERE booleanExpression)?
177177
;
178178

179179
qualifiedName

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

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

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

Lines changed: 840 additions & 850 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 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)