ESQL: Fix grammar changes around per agg filtering

Remove dev flag left in grammar for agg filtering Related to elastic#113735
costin · Oct 15, 2024 · b1367aa · b1367aa
1 parent 6ec7a9a
commit b1367aa
Show file tree

Hide file tree

Showing 6 changed files with 1,314 additions and 1,336 deletions.
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4
@@ -209,7 +209,7 @@ SLASH : '/';
 PERCENT : '%';
 
 MATCH : 'match';
-NESTED_WHERE : {this.isDevVersion()}? WHERE -> type(WHERE);
+NESTED_WHERE : WHERE -> type(WHERE);
 
 NAMED_OR_POSITIONAL_PARAM
     : PARAM (LETTER | UNDERSCORE) UNQUOTED_ID_BODY*

diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4
@@ -173,7 +173,7 @@ aggFields
     ;
 
 aggField
-    : field {this.isDevVersion()}? (WHERE booleanExpression)?
+    : field (WHERE booleanExpression)?
     ;
 
 qualifiedName

diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp