Skip to content

Commit dbf92f4

Browse files
[ES|QL] Update grammars (elastic#226708)
This PR updates the ES|QL grammars (lexer and parser) to match the latest version in Elasticsearch.
1 parent 8a1eeec commit dbf92f4

10 files changed

Lines changed: 2117 additions & 1997 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import ChangePoint,
6262
Expression,
6363
From,
6464
Fork,
65+
Fuse,
6566
Join,
6667
Lookup,
6768
MvExpand,

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

0 commit comments

Comments
 (0)