[ES|QL] Update grammars (#190289)

This PR updates the ES|QL grammars (lexer and parser) to match the latest version in Elasticsearch. --------- Co-authored-by: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
elastic · Aug 12, 2024 · fd9805d · fd9805d
1 parent eaf4bb0
commit fd9805d
Show file tree

Hide file tree

Showing 12 changed files with 1,873 additions and 1,707 deletions.
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4 b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
@@ -30,6 +30,7 @@ SHOW : 'show'                 -> pushMode(SHOW_MODE);
 SORT : 'sort'                 -> pushMode(EXPRESSION_MODE);
 STATS : 'stats'               -> pushMode(EXPRESSION_MODE);
 WHERE : 'where'               -> pushMode(EXPRESSION_MODE);
+MATCH : 'match'               -> pushMode(EXPRESSION_MODE);
 UNKNOWN_CMD : ~[ \r\n\t[\]/]+ -> pushMode(EXPRESSION_MODE);
 
 LINE_COMMENT
@@ -145,7 +146,7 @@ IS: 'is';
 LAST : 'last';
 LIKE: 'like';
 LP : '(';
-MATCH: 'match';
+MATCH_OPERATOR: 'match';
 NOT : 'not';
 NULL : 'null';
 NULLS : 'nulls';

diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
@@ -18,111 +18,112 @@ SHOW=17
 SORT=18
 STATS=19
 WHERE=20
-UNKNOWN_CMD=21
-LINE_COMMENT=22
-MULTILINE_COMMENT=23
-WS=24
-UNQUOTED_SOURCE=25
-EXPLAIN_WS=26
-EXPLAIN_LINE_COMMENT=27
-EXPLAIN_MULTILINE_COMMENT=28
-PIPE=29
-QUOTED_STRING=30
-INTEGER_LITERAL=31
-DECIMAL_LITERAL=32
-BY=33
-AND=34
-ASC=35
-ASSIGN=36
-CAST_OP=37
-COMMA=38
-DESC=39
-DOT=40
-FALSE=41
-FIRST=42
-IN=43
-IS=44
-LAST=45
-LIKE=46
-LP=47
-MATCH=48
-NOT=49
-NULL=50
-NULLS=51
-OR=52
-PARAM=53
-RLIKE=54
-RP=55
-TRUE=56
-EQ=57
-CIEQ=58
-NEQ=59
-LT=60
-LTE=61
-GT=62
-GTE=63
-PLUS=64
-MINUS=65
-ASTERISK=66
-SLASH=67
-PERCENT=68
-NAMED_OR_POSITIONAL_PARAM=69
-OPENING_BRACKET=70
-CLOSING_BRACKET=71
-UNQUOTED_IDENTIFIER=72
-QUOTED_IDENTIFIER=73
-EXPR_LINE_COMMENT=74
-EXPR_MULTILINE_COMMENT=75
-EXPR_WS=76
-METADATA=77
-FROM_LINE_COMMENT=78
-FROM_MULTILINE_COMMENT=79
-FROM_WS=80
-ID_PATTERN=81
-PROJECT_LINE_COMMENT=82
-PROJECT_MULTILINE_COMMENT=83
-PROJECT_WS=84
-AS=85
-RENAME_LINE_COMMENT=86
-RENAME_MULTILINE_COMMENT=87
-RENAME_WS=88
-ON=89
-WITH=90
-ENRICH_POLICY_NAME=91
-ENRICH_LINE_COMMENT=92
-ENRICH_MULTILINE_COMMENT=93
-ENRICH_WS=94
-ENRICH_FIELD_LINE_COMMENT=95
-ENRICH_FIELD_MULTILINE_COMMENT=96
-ENRICH_FIELD_WS=97
-LOOKUP_LINE_COMMENT=98
-LOOKUP_MULTILINE_COMMENT=99
-LOOKUP_WS=100
-LOOKUP_FIELD_LINE_COMMENT=101
-LOOKUP_FIELD_MULTILINE_COMMENT=102
-LOOKUP_FIELD_WS=103
-MVEXPAND_LINE_COMMENT=104
-MVEXPAND_MULTILINE_COMMENT=105
-MVEXPAND_WS=106
-INFO=107
-SHOW_LINE_COMMENT=108
-SHOW_MULTILINE_COMMENT=109
-SHOW_WS=110
-FUNCTIONS=111
-META_LINE_COMMENT=112
-META_MULTILINE_COMMENT=113
-META_WS=114
-COLON=115
-SETTING=116
-SETTING_LINE_COMMENT=117
-SETTTING_MULTILINE_COMMENT=118
-SETTING_WS=119
-METRICS_LINE_COMMENT=120
-METRICS_MULTILINE_COMMENT=121
-METRICS_WS=122
-CLOSING_METRICS_LINE_COMMENT=123
-CLOSING_METRICS_MULTILINE_COMMENT=124
-CLOSING_METRICS_WS=125
+MATCH=21
+UNKNOWN_CMD=22
+LINE_COMMENT=23
+MULTILINE_COMMENT=24
+WS=25
+UNQUOTED_SOURCE=26
+EXPLAIN_WS=27
+EXPLAIN_LINE_COMMENT=28
+EXPLAIN_MULTILINE_COMMENT=29
+PIPE=30
+QUOTED_STRING=31
+INTEGER_LITERAL=32
+DECIMAL_LITERAL=33
+BY=34
+AND=35
+ASC=36
+ASSIGN=37
+CAST_OP=38
+COMMA=39
+DESC=40
+DOT=41
+FALSE=42
+FIRST=43
+IN=44
+IS=45
+LAST=46
+LIKE=47
+LP=48
+MATCH_OPERATOR=49
+NOT=50
+NULL=51
+NULLS=52
+OR=53
+PARAM=54
+RLIKE=55
+RP=56
+TRUE=57
+EQ=58
+CIEQ=59
+NEQ=60
+LT=61
+LTE=62
+GT=63
+GTE=64
+PLUS=65
+MINUS=66
+ASTERISK=67
+SLASH=68
+PERCENT=69
+NAMED_OR_POSITIONAL_PARAM=70
+OPENING_BRACKET=71
+CLOSING_BRACKET=72
+UNQUOTED_IDENTIFIER=73
+QUOTED_IDENTIFIER=74
+EXPR_LINE_COMMENT=75
+EXPR_MULTILINE_COMMENT=76
+EXPR_WS=77
+METADATA=78
+FROM_LINE_COMMENT=79
+FROM_MULTILINE_COMMENT=80
+FROM_WS=81
+ID_PATTERN=82
+PROJECT_LINE_COMMENT=83
+PROJECT_MULTILINE_COMMENT=84
+PROJECT_WS=85
+AS=86
+RENAME_LINE_COMMENT=87
+RENAME_MULTILINE_COMMENT=88
+RENAME_WS=89
+ON=90
+WITH=91
+ENRICH_POLICY_NAME=92
+ENRICH_LINE_COMMENT=93
+ENRICH_MULTILINE_COMMENT=94
+ENRICH_WS=95
+ENRICH_FIELD_LINE_COMMENT=96
+ENRICH_FIELD_MULTILINE_COMMENT=97
+ENRICH_FIELD_WS=98
+LOOKUP_LINE_COMMENT=99
+LOOKUP_MULTILINE_COMMENT=100
+LOOKUP_WS=101
+LOOKUP_FIELD_LINE_COMMENT=102
+LOOKUP_FIELD_MULTILINE_COMMENT=103
+LOOKUP_FIELD_WS=104
+MVEXPAND_LINE_COMMENT=105
+MVEXPAND_MULTILINE_COMMENT=106
+MVEXPAND_WS=107
+INFO=108
+SHOW_LINE_COMMENT=109
+SHOW_MULTILINE_COMMENT=110
+SHOW_WS=111
+FUNCTIONS=112
+META_LINE_COMMENT=113
+META_MULTILINE_COMMENT=114
+META_WS=115
+COLON=116
+SETTING=117
+SETTING_LINE_COMMENT=118
+SETTTING_MULTILINE_COMMENT=119
+SETTING_WS=120
+METRICS_LINE_COMMENT=121
+METRICS_MULTILINE_COMMENT=122
+METRICS_WS=123
+CLOSING_METRICS_LINE_COMMENT=124
+CLOSING_METRICS_MULTILINE_COMMENT=125
+CLOSING_METRICS_WS=126
 'dissect'=1
 'drop'=2
 'enrich'=3
@@ -143,48 +144,47 @@ CLOSING_METRICS_WS=125
 'sort'=18
 'stats'=19
 'where'=20
-'|'=29
-'by'=33
-'and'=34
-'asc'=35
-'='=36
-'::'=37
-','=38
-'desc'=39
-'.'=40
-'false'=41
-'first'=42
-'in'=43
-'is'=44
-'last'=45
-'like'=46
-'('=47
-'match'=48
-'not'=49
-'null'=50
-'nulls'=51
-'or'=52
-'?'=53
-'rlike'=54
-')'=55
-'true'=56
-'=='=57
-'=~'=58
-'!='=59
-'<'=60
-'<='=61
-'>'=62
-'>='=63
-'+'=64
-'-'=65
-'*'=66
-'/'=67
-'%'=68
-']'=71
-'metadata'=77
-'as'=85
-'on'=89
-'with'=90
-'info'=107
-'functions'=111
-':'=115
+'|'=30
+'by'=34
+'and'=35
+'asc'=36
+'='=37
+'::'=38
+','=39
+'desc'=40
+'.'=41
+'false'=42
+'first'=43
+'in'=44
+'is'=45
+'last'=46
+'like'=47
+'('=48
+'not'=50
+'null'=51
+'nulls'=52
+'or'=53
+'?'=54
+'rlike'=55
+')'=56
+'true'=57
+'=='=58
+'=~'=59
+'!='=60
+'<'=61
+'<='=62
+'>'=63
+'>='=64
+'+'=65
+'-'=66
+'*'=67
+'/'=68
+'%'=69
+']'=72
+'metadata'=78
+'as'=86
+'on'=90
+'with'=91
+'info'=108
+'functions'=112
+':'=116