Skip to content

Commit

Permalink
[8.x] [ES|QL] Update grammars (elastic#194370) (elastic#194378)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.x`:
- [[ES|QL] Update grammars
(elastic#194370)](elastic#194370)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Kibana
Machine","email":"42973632+kibanamachine@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-09-30T07:39:17Z","message":"[ES|QL]
Update grammars (elastic#194370)\n\nThis PR updates the ES|QL grammars (lexer
and parser) to match the\r\nlatest version in
Elasticsearch.\r\n\r\nCo-authored-by: Stratoula Kalafateli
<efstratia.kalafateli@elastic.co>","sha":"94120d9e40014fb82c82a1621321e12f65482e04","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-minor","Feature:ES|QL","Team:ESQL"],"title":"[ES|QL]
Update
grammars","number":194370,"url":"https://github.com/elastic/kibana/pull/194370","mergeCommit":{"message":"[ES|QL]
Update grammars (elastic#194370)\n\nThis PR updates the ES|QL grammars (lexer
and parser) to match the\r\nlatest version in
Elasticsearch.\r\n\r\nCo-authored-by: Stratoula Kalafateli
<efstratia.kalafateli@elastic.co>","sha":"94120d9e40014fb82c82a1621321e12f65482e04"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/194370","number":194370,"mergeCommit":{"message":"[ES|QL]
Update grammars (elastic#194370)\n\nThis PR updates the ES|QL grammars (lexer
and parser) to match the\r\nlatest version in
Elasticsearch.\r\n\r\nCo-authored-by: Stratoula Kalafateli
<efstratia.kalafateli@elastic.co>","sha":"94120d9e40014fb82c82a1621321e12f65482e04"}}]}]
BACKPORT-->
  • Loading branch information
kibanamachine authored and neptunian committed Oct 1, 2024
1 parent 7e8f1f5 commit d5a91c9
Show file tree
Hide file tree
Showing 4 changed files with 510 additions and 669 deletions.
9 changes: 0 additions & 9 deletions packages/kbn-esql-ast/src/antlr/esql_parser.g4
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ processingCommand
// in development
| {this.isDevVersion()}? inlinestatsCommand
| {this.isDevVersion()}? lookupCommand
| {this.isDevVersion()}? matchCommand
;

whereCommand
Expand Down Expand Up @@ -313,12 +312,4 @@ lookupCommand

inlinestatsCommand
: DEV_INLINESTATS stats=fields (BY grouping=fields)?
;

matchCommand
: DEV_MATCH matchQuery
;

matchQuery
: QUOTED_STRING
;
4 changes: 1 addition & 3 deletions packages/kbn-esql-ast/src/antlr/esql_parser.interp

Large diffs are not rendered by default.

Loading

0 comments on commit d5a91c9

Please sign in to comment.