Skip to content

Commit 161e3d5

Browse files
[8.x] [ES|QL] Update grammars (#218046) (#218103)
# Backport This will backport the following commits from `main` to `8.x`: - [[ES|QL] Update grammars (#218046)](#218046) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Kibana Machine","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-04-14T12:27:44Z","message":"[ES|QL] Update grammars (#218046)\n\nThis PR updates the ES|QL grammars (lexer and parser) to match the\nlatest version in Elasticsearch.\n\n---------\n\nCo-authored-by: Stratoula Kalafateli <[email protected]>","sha":"478011f3a81c2568da3ca572660a69a68e375179","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Feature:ES|QL","Team:ESQL","backport:version","v9.1.0","v8.19.0"],"title":"[ES|QL] Update grammars","number":218046,"url":"https://github.com/elastic/kibana/pull/218046","mergeCommit":{"message":"[ES|QL] Update grammars (#218046)\n\nThis PR updates the ES|QL grammars (lexer and parser) to match the\nlatest version in Elasticsearch.\n\n---------\n\nCo-authored-by: Stratoula Kalafateli <[email protected]>","sha":"478011f3a81c2568da3ca572660a69a68e375179"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/218046","number":218046,"mergeCommit":{"message":"[ES|QL] Update grammars (#218046)\n\nThis PR updates the ES|QL grammars (lexer and parser) to match the\nlatest version in Elasticsearch.\n\n---------\n\nCo-authored-by: Stratoula Kalafateli <[email protected]>","sha":"478011f3a81c2568da3ca572660a69a68e375179"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
1 parent 313e10d commit 161e3d5

File tree

12 files changed

+2168
-1984
lines changed

12 files changed

+2168
-1984
lines changed

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

Lines changed: 4 additions & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 178 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -12,129 +12,130 @@ ROW=11
1212
SORT=12
1313
STATS=13
1414
WHERE=14
15-
DEV_INLINESTATS=15
16-
DEV_RERANK=16
17-
FROM=17
18-
DEV_TIME_SERIES=18
19-
DEV_FORK=19
20-
JOIN_LOOKUP=20
21-
DEV_JOIN_FULL=21
22-
DEV_JOIN_LEFT=22
23-
DEV_JOIN_RIGHT=23
24-
DEV_LOOKUP=24
25-
MV_EXPAND=25
26-
DROP=26
27-
KEEP=27
28-
DEV_INSIST=28
29-
DEV_RRF=29
30-
RENAME=30
31-
SHOW=31
32-
UNKNOWN_CMD=32
33-
CHANGE_POINT_LINE_COMMENT=33
34-
CHANGE_POINT_MULTILINE_COMMENT=34
35-
CHANGE_POINT_WS=35
36-
ENRICH_POLICY_NAME=36
37-
ENRICH_LINE_COMMENT=37
38-
ENRICH_MULTILINE_COMMENT=38
39-
ENRICH_WS=39
40-
ENRICH_FIELD_LINE_COMMENT=40
41-
ENRICH_FIELD_MULTILINE_COMMENT=41
42-
ENRICH_FIELD_WS=42
43-
SETTING=43
44-
SETTING_LINE_COMMENT=44
45-
SETTTING_MULTILINE_COMMENT=45
46-
SETTING_WS=46
47-
EXPLAIN_WS=47
48-
EXPLAIN_LINE_COMMENT=48
49-
EXPLAIN_MULTILINE_COMMENT=49
50-
PIPE=50
51-
QUOTED_STRING=51
52-
INTEGER_LITERAL=52
53-
DECIMAL_LITERAL=53
54-
AND=54
55-
AS=55
56-
ASC=56
57-
ASSIGN=57
58-
BY=58
59-
CAST_OP=59
60-
COLON=60
61-
COMMA=61
62-
DESC=62
63-
DOT=63
64-
FALSE=64
65-
FIRST=65
66-
IN=66
67-
IS=67
68-
LAST=68
69-
LIKE=69
70-
NOT=70
71-
NULL=71
72-
NULLS=72
73-
ON=73
74-
OR=74
75-
PARAM=75
76-
RLIKE=76
77-
TRUE=77
78-
WITH=78
79-
EQ=79
80-
CIEQ=80
81-
NEQ=81
82-
LT=82
83-
LTE=83
84-
GT=84
85-
GTE=85
86-
PLUS=86
87-
MINUS=87
88-
ASTERISK=88
89-
SLASH=89
90-
PERCENT=90
91-
LEFT_BRACES=91
92-
RIGHT_BRACES=92
93-
DOUBLE_PARAMS=93
94-
NAMED_OR_POSITIONAL_PARAM=94
95-
NAMED_OR_POSITIONAL_DOUBLE_PARAMS=95
96-
OPENING_BRACKET=96
97-
CLOSING_BRACKET=97
98-
LP=98
99-
RP=99
100-
UNQUOTED_IDENTIFIER=100
101-
QUOTED_IDENTIFIER=101
102-
EXPR_LINE_COMMENT=102
103-
EXPR_MULTILINE_COMMENT=103
104-
EXPR_WS=104
105-
METADATA=105
106-
UNQUOTED_SOURCE=106
107-
FROM_LINE_COMMENT=107
108-
FROM_MULTILINE_COMMENT=108
109-
FROM_WS=109
110-
FORK_WS=110
111-
FORK_LINE_COMMENT=111
112-
FORK_MULTILINE_COMMENT=112
113-
JOIN=113
114-
USING=114
115-
JOIN_LINE_COMMENT=115
116-
JOIN_MULTILINE_COMMENT=116
117-
JOIN_WS=117
118-
LOOKUP_LINE_COMMENT=118
119-
LOOKUP_MULTILINE_COMMENT=119
120-
LOOKUP_WS=120
121-
LOOKUP_FIELD_LINE_COMMENT=121
122-
LOOKUP_FIELD_MULTILINE_COMMENT=122
123-
LOOKUP_FIELD_WS=123
124-
MVEXPAND_LINE_COMMENT=124
125-
MVEXPAND_MULTILINE_COMMENT=125
126-
MVEXPAND_WS=126
127-
ID_PATTERN=127
128-
PROJECT_LINE_COMMENT=128
129-
PROJECT_MULTILINE_COMMENT=129
130-
PROJECT_WS=130
131-
RENAME_LINE_COMMENT=131
132-
RENAME_MULTILINE_COMMENT=132
133-
RENAME_WS=133
134-
INFO=134
135-
SHOW_LINE_COMMENT=135
136-
SHOW_MULTILINE_COMMENT=136
137-
SHOW_WS=137
15+
DEV_COMPLETION=15
16+
DEV_INLINESTATS=16
17+
DEV_RERANK=17
18+
FROM=18
19+
DEV_TIME_SERIES=19
20+
DEV_FORK=20
21+
JOIN_LOOKUP=21
22+
DEV_JOIN_FULL=22
23+
DEV_JOIN_LEFT=23
24+
DEV_JOIN_RIGHT=24
25+
DEV_LOOKUP=25
26+
MV_EXPAND=26
27+
DROP=27
28+
KEEP=28
29+
DEV_INSIST=29
30+
DEV_RRF=30
31+
RENAME=31
32+
SHOW=32
33+
UNKNOWN_CMD=33
34+
CHANGE_POINT_LINE_COMMENT=34
35+
CHANGE_POINT_MULTILINE_COMMENT=35
36+
CHANGE_POINT_WS=36
37+
ENRICH_POLICY_NAME=37
38+
ENRICH_LINE_COMMENT=38
39+
ENRICH_MULTILINE_COMMENT=39
40+
ENRICH_WS=40
41+
ENRICH_FIELD_LINE_COMMENT=41
42+
ENRICH_FIELD_MULTILINE_COMMENT=42
43+
ENRICH_FIELD_WS=43
44+
SETTING=44
45+
SETTING_LINE_COMMENT=45
46+
SETTTING_MULTILINE_COMMENT=46
47+
SETTING_WS=47
48+
EXPLAIN_WS=48
49+
EXPLAIN_LINE_COMMENT=49
50+
EXPLAIN_MULTILINE_COMMENT=50
51+
PIPE=51
52+
QUOTED_STRING=52
53+
INTEGER_LITERAL=53
54+
DECIMAL_LITERAL=54
55+
AND=55
56+
AS=56
57+
ASC=57
58+
ASSIGN=58
59+
BY=59
60+
CAST_OP=60
61+
COLON=61
62+
COMMA=62
63+
DESC=63
64+
DOT=64
65+
FALSE=65
66+
FIRST=66
67+
IN=67
68+
IS=68
69+
LAST=69
70+
LIKE=70
71+
NOT=71
72+
NULL=72
73+
NULLS=73
74+
ON=74
75+
OR=75
76+
PARAM=76
77+
RLIKE=77
78+
TRUE=78
79+
WITH=79
80+
EQ=80
81+
CIEQ=81
82+
NEQ=82
83+
LT=83
84+
LTE=84
85+
GT=85
86+
GTE=86
87+
PLUS=87
88+
MINUS=88
89+
ASTERISK=89
90+
SLASH=90
91+
PERCENT=91
92+
LEFT_BRACES=92
93+
RIGHT_BRACES=93
94+
DOUBLE_PARAMS=94
95+
NAMED_OR_POSITIONAL_PARAM=95
96+
NAMED_OR_POSITIONAL_DOUBLE_PARAMS=96
97+
OPENING_BRACKET=97
98+
CLOSING_BRACKET=98
99+
LP=99
100+
RP=100
101+
UNQUOTED_IDENTIFIER=101
102+
QUOTED_IDENTIFIER=102
103+
EXPR_LINE_COMMENT=103
104+
EXPR_MULTILINE_COMMENT=104
105+
EXPR_WS=105
106+
METADATA=106
107+
UNQUOTED_SOURCE=107
108+
FROM_LINE_COMMENT=108
109+
FROM_MULTILINE_COMMENT=109
110+
FROM_WS=110
111+
FORK_WS=111
112+
FORK_LINE_COMMENT=112
113+
FORK_MULTILINE_COMMENT=113
114+
JOIN=114
115+
USING=115
116+
JOIN_LINE_COMMENT=116
117+
JOIN_MULTILINE_COMMENT=117
118+
JOIN_WS=118
119+
LOOKUP_LINE_COMMENT=119
120+
LOOKUP_MULTILINE_COMMENT=120
121+
LOOKUP_WS=121
122+
LOOKUP_FIELD_LINE_COMMENT=122
123+
LOOKUP_FIELD_MULTILINE_COMMENT=123
124+
LOOKUP_FIELD_WS=124
125+
MVEXPAND_LINE_COMMENT=125
126+
MVEXPAND_MULTILINE_COMMENT=126
127+
MVEXPAND_WS=127
128+
ID_PATTERN=128
129+
PROJECT_LINE_COMMENT=129
130+
PROJECT_MULTILINE_COMMENT=130
131+
PROJECT_WS=131
132+
RENAME_LINE_COMMENT=132
133+
RENAME_MULTILINE_COMMENT=133
134+
RENAME_WS=134
135+
INFO=135
136+
SHOW_LINE_COMMENT=136
137+
SHOW_MULTILINE_COMMENT=137
138+
SHOW_WS=138
138139
'enrich'=5
139140
'explain'=6
140141
'dissect'=7
@@ -145,57 +146,57 @@ SHOW_WS=137
145146
'sort'=12
146147
'stats'=13
147148
'where'=14
148-
'from'=17
149-
'lookup'=20
150-
'mv_expand'=25
151-
'drop'=26
152-
'keep'=27
153-
'rename'=30
154-
'show'=31
155-
'|'=50
156-
'and'=54
157-
'as'=55
158-
'asc'=56
159-
'='=57
160-
'by'=58
161-
'::'=59
162-
':'=60
163-
','=61
164-
'desc'=62
165-
'.'=63
166-
'false'=64
167-
'first'=65
168-
'in'=66
169-
'is'=67
170-
'last'=68
171-
'like'=69
172-
'not'=70
173-
'null'=71
174-
'nulls'=72
175-
'on'=73
176-
'or'=74
177-
'?'=75
178-
'rlike'=76
179-
'true'=77
180-
'with'=78
181-
'=='=79
182-
'=~'=80
183-
'!='=81
184-
'<'=82
185-
'<='=83
186-
'>'=84
187-
'>='=85
188-
'+'=86
189-
'-'=87
190-
'*'=88
191-
'/'=89
192-
'%'=90
193-
'{'=91
194-
'}'=92
195-
'??'=93
196-
']'=97
197-
')'=99
198-
'metadata'=105
199-
'join'=113
200-
'USING'=114
201-
'info'=134
149+
'from'=18
150+
'lookup'=21
151+
'mv_expand'=26
152+
'drop'=27
153+
'keep'=28
154+
'rename'=31
155+
'show'=32
156+
'|'=51
157+
'and'=55
158+
'as'=56
159+
'asc'=57
160+
'='=58
161+
'by'=59
162+
'::'=60
163+
':'=61
164+
','=62
165+
'desc'=63
166+
'.'=64
167+
'false'=65
168+
'first'=66
169+
'in'=67
170+
'is'=68
171+
'last'=69
172+
'like'=70
173+
'not'=71
174+
'null'=72
175+
'nulls'=73
176+
'on'=74
177+
'or'=75
178+
'?'=76
179+
'rlike'=77
180+
'true'=78
181+
'with'=79
182+
'=='=80
183+
'=~'=81
184+
'!='=82
185+
'<'=83
186+
'<='=84
187+
'>'=85
188+
'>='=86
189+
'+'=87
190+
'-'=88
191+
'*'=89
192+
'/'=90
193+
'%'=91
194+
'{'=92
195+
'}'=93
196+
'??'=94
197+
']'=98
198+
')'=100
199+
'metadata'=106
200+
'join'=114
201+
'USING'=115
202+
'info'=135

0 commit comments

Comments
 (0)