Skip to content

Commit 7598cbf

Browse files
kibanamachinestratoula
authored andcommitted
[ES|QL] Update grammars (elastic#215621)
This PR updates the ES|QL grammars (lexer and parser) to match the latest version in Elasticsearch. --------- Co-authored-by: Stratoula Kalafateli <[email protected]>
1 parent 3db36e3 commit 7598cbf

File tree

22 files changed

+1753
-2229
lines changed

22 files changed

+1753
-2229
lines changed

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.g4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ import ChangePoint,
6464
Fork,
6565
Join,
6666
Lookup,
67-
Metrics,
6867
MvExpand,
6968
Project,
7069
Rrf,

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.interp

Lines changed: 4 additions & 33 deletions
Large diffs are not rendered by default.

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.tokens

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ STATS=13
1414
WHERE=14
1515
DEV_INLINESTATS=15
1616
FROM=16
17-
DEV_FORK=17
18-
JOIN_LOOKUP=18
19-
DEV_JOIN_FULL=19
20-
DEV_JOIN_LEFT=20
21-
DEV_JOIN_RIGHT=21
22-
DEV_LOOKUP=22
23-
DEV_METRICS=23
17+
DEV_METRICS=17
18+
DEV_FORK=18
19+
JOIN_LOOKUP=19
20+
DEV_JOIN_FULL=20
21+
DEV_JOIN_LEFT=21
22+
DEV_JOIN_RIGHT=22
23+
DEV_LOOKUP=23
2424
MV_EXPAND=24
2525
DROP=25
2626
KEEP=26
@@ -119,27 +119,21 @@ LOOKUP_WS=118
119119
LOOKUP_FIELD_LINE_COMMENT=119
120120
LOOKUP_FIELD_MULTILINE_COMMENT=120
121121
LOOKUP_FIELD_WS=121
122-
METRICS_LINE_COMMENT=122
123-
METRICS_MULTILINE_COMMENT=123
124-
METRICS_WS=124
125-
CLOSING_METRICS_LINE_COMMENT=125
126-
CLOSING_METRICS_MULTILINE_COMMENT=126
127-
CLOSING_METRICS_WS=127
128-
MVEXPAND_LINE_COMMENT=128
129-
MVEXPAND_MULTILINE_COMMENT=129
130-
MVEXPAND_WS=130
131-
ID_PATTERN=131
132-
PROJECT_LINE_COMMENT=132
133-
PROJECT_MULTILINE_COMMENT=133
134-
PROJECT_WS=134
135-
AS=135
136-
RENAME_LINE_COMMENT=136
137-
RENAME_MULTILINE_COMMENT=137
138-
RENAME_WS=138
139-
INFO=139
140-
SHOW_LINE_COMMENT=140
141-
SHOW_MULTILINE_COMMENT=141
142-
SHOW_WS=142
122+
MVEXPAND_LINE_COMMENT=122
123+
MVEXPAND_MULTILINE_COMMENT=123
124+
MVEXPAND_WS=124
125+
ID_PATTERN=125
126+
PROJECT_LINE_COMMENT=126
127+
PROJECT_MULTILINE_COMMENT=127
128+
PROJECT_WS=128
129+
AS=129
130+
RENAME_LINE_COMMENT=130
131+
RENAME_MULTILINE_COMMENT=131
132+
RENAME_WS=132
133+
INFO=133
134+
SHOW_LINE_COMMENT=134
135+
SHOW_MULTILINE_COMMENT=135
136+
SHOW_WS=136
143137
'enrich'=5
144138
'explain'=6
145139
'dissect'=7
@@ -151,7 +145,7 @@ SHOW_WS=142
151145
'stats'=13
152146
'where'=14
153147
'from'=16
154-
'lookup'=18
148+
'lookup'=19
155149
'mv_expand'=24
156150
'drop'=25
157151
'keep'=26
@@ -201,5 +195,5 @@ SHOW_WS=142
201195
'metadata'=103
202196
'join'=111
203197
'USING'=112
204-
'as'=135
205-
'info'=139
198+
'as'=129
199+
'info'=133

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_lexer.ts

Lines changed: 652 additions & 713 deletions
Large diffs are not rendered by default.

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.g4

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,15 @@ field
8787
;
8888

8989
fromCommand
90-
: FROM indexPattern (COMMA indexPattern)* metadata?
90+
: FROM indexPatternAndMetadataFields
91+
;
92+
93+
metricsCommand
94+
: DEV_METRICS indexPatternAndMetadataFields
95+
;
96+
97+
indexPatternAndMetadataFields:
98+
indexPattern (COMMA indexPattern)* metadata?
9199
;
92100

93101
indexPattern
@@ -108,10 +116,6 @@ metadata
108116
: METADATA UNQUOTED_SOURCE (COMMA UNQUOTED_SOURCE)*
109117
;
110118

111-
metricsCommand
112-
: DEV_METRICS indexPattern (COMMA indexPattern)* aggregates=aggFields? (BY grouping=fields)?
113-
;
114-
115119
evalCommand
116120
: EVAL fields
117121
;
@@ -279,4 +283,4 @@ forkSubQueryProcessingCommand
279283

280284
rrfCommand
281285
: DEV_RRF
282-
;
286+
;

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.interp

Lines changed: 5 additions & 16 deletions
Large diffs are not rendered by default.

src/platform/packages/shared/kbn-esql-ast/src/antlr/esql_parser.tokens

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ STATS=13
1414
WHERE=14
1515
DEV_INLINESTATS=15
1616
FROM=16
17-
DEV_FORK=17
18-
JOIN_LOOKUP=18
19-
DEV_JOIN_FULL=19
20-
DEV_JOIN_LEFT=20
21-
DEV_JOIN_RIGHT=21
22-
DEV_LOOKUP=22
23-
DEV_METRICS=23
17+
DEV_METRICS=17
18+
DEV_FORK=18
19+
JOIN_LOOKUP=19
20+
DEV_JOIN_FULL=20
21+
DEV_JOIN_LEFT=21
22+
DEV_JOIN_RIGHT=22
23+
DEV_LOOKUP=23
2424
MV_EXPAND=24
2525
DROP=25
2626
KEEP=26
@@ -119,27 +119,21 @@ LOOKUP_WS=118
119119
LOOKUP_FIELD_LINE_COMMENT=119
120120
LOOKUP_FIELD_MULTILINE_COMMENT=120
121121
LOOKUP_FIELD_WS=121
122-
METRICS_LINE_COMMENT=122
123-
METRICS_MULTILINE_COMMENT=123
124-
METRICS_WS=124
125-
CLOSING_METRICS_LINE_COMMENT=125
126-
CLOSING_METRICS_MULTILINE_COMMENT=126
127-
CLOSING_METRICS_WS=127
128-
MVEXPAND_LINE_COMMENT=128
129-
MVEXPAND_MULTILINE_COMMENT=129
130-
MVEXPAND_WS=130
131-
ID_PATTERN=131
132-
PROJECT_LINE_COMMENT=132
133-
PROJECT_MULTILINE_COMMENT=133
134-
PROJECT_WS=134
135-
AS=135
136-
RENAME_LINE_COMMENT=136
137-
RENAME_MULTILINE_COMMENT=137
138-
RENAME_WS=138
139-
INFO=139
140-
SHOW_LINE_COMMENT=140
141-
SHOW_MULTILINE_COMMENT=141
142-
SHOW_WS=142
122+
MVEXPAND_LINE_COMMENT=122
123+
MVEXPAND_MULTILINE_COMMENT=123
124+
MVEXPAND_WS=124
125+
ID_PATTERN=125
126+
PROJECT_LINE_COMMENT=126
127+
PROJECT_MULTILINE_COMMENT=127
128+
PROJECT_WS=128
129+
AS=129
130+
RENAME_LINE_COMMENT=130
131+
RENAME_MULTILINE_COMMENT=131
132+
RENAME_WS=132
133+
INFO=133
134+
SHOW_LINE_COMMENT=134
135+
SHOW_MULTILINE_COMMENT=135
136+
SHOW_WS=136
143137
'enrich'=5
144138
'explain'=6
145139
'dissect'=7
@@ -151,7 +145,7 @@ SHOW_WS=142
151145
'stats'=13
152146
'where'=14
153147
'from'=16
154-
'lookup'=18
148+
'lookup'=19
155149
'mv_expand'=24
156150
'drop'=25
157151
'keep'=26
@@ -201,5 +195,5 @@ SHOW_WS=142
201195
'metadata'=103
202196
'join'=111
203197
'USING'=112
204-
'as'=135
205-
'info'=139
198+
'as'=129
199+
'info'=133

0 commit comments

Comments
 (0)