mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 01:13:23 -04:00
[ES|QL] Update grammars (#211369)
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>
This commit is contained in:
Kibana Machine
GitHub
parent
24b75740fd
commit
579388d03e
11 changed files with 2177 additions and 1738 deletions
|
|
@ -87,13 +87,15 @@ JOIN_LOOKUP : 'lookup' -> pushMode(JOIN_MODE);
|
|||
// Once the command has been stabilized, remove the DEV_ prefix and the {}? conditional and move the command to the
|
||||
// main section while preserving alphabetical order:
|
||||
// MYCOMMAND : 'mycommand' -> ...
|
||||
DEV_INLINESTATS : {this.isDevVersion()}? 'inlinestats' -> pushMode(EXPRESSION_MODE);
|
||||
DEV_LOOKUP : {this.isDevVersion()}? 'lookup_🐔' -> pushMode(LOOKUP_MODE);
|
||||
DEV_METRICS : {this.isDevVersion()}? 'metrics' -> pushMode(METRICS_MODE);
|
||||
DEV_CHANGE_POINT : {this.isDevVersion()}? 'change_point' -> pushMode(CHANGE_POINT_MODE);
|
||||
DEV_INLINESTATS : {this.isDevVersion()}? 'inlinestats' -> pushMode(EXPRESSION_MODE);
|
||||
DEV_INSIST : {this.isDevVersion()}? 'insist_🐔' -> pushMode(PROJECT_MODE);
|
||||
DEV_LOOKUP : {this.isDevVersion()}? 'lookup_🐔' -> pushMode(LOOKUP_MODE);
|
||||
DEV_METRICS : {this.isDevVersion()}? 'metrics' -> pushMode(METRICS_MODE);
|
||||
// list of all JOIN commands
|
||||
DEV_JOIN_FULL : {this.isDevVersion()}? 'full' -> pushMode(JOIN_MODE);
|
||||
DEV_JOIN_LEFT : {this.isDevVersion()}? 'left' -> pushMode(JOIN_MODE);
|
||||
DEV_JOIN_RIGHT : {this.isDevVersion()}? 'right' -> pushMode(JOIN_MODE);
|
||||
DEV_JOIN_FULL : {this.isDevVersion()}? 'full' -> pushMode(JOIN_MODE);
|
||||
DEV_JOIN_LEFT : {this.isDevVersion()}? 'left' -> pushMode(JOIN_MODE);
|
||||
DEV_JOIN_RIGHT : {this.isDevVersion()}? 'right' -> pushMode(JOIN_MODE);
|
||||
|
||||
|
||||
//
|
||||
|
|
@ -309,8 +311,9 @@ FROM_MULTILINE_COMMENT
|
|||
FROM_WS
|
||||
: WS -> channel(HIDDEN)
|
||||
;
|
||||
|
||||
//
|
||||
// DROP, KEEP
|
||||
// DROP, KEEP, INSIST
|
||||
//
|
||||
mode PROJECT_MODE;
|
||||
PROJECT_PIPE : PIPE -> type(PIPE), popMode;
|
||||
|
|
@ -639,4 +642,31 @@ CLOSING_METRICS_BY
|
|||
|
||||
CLOSING_METRICS_PIPE
|
||||
: PIPE -> type(PIPE), popMode
|
||||
;
|
||||
;
|
||||
|
||||
///
|
||||
/// CHANGE_POINT command
|
||||
///
|
||||
mode CHANGE_POINT_MODE;
|
||||
|
||||
CHANGE_POINT_PIPE : PIPE -> type(PIPE), popMode;
|
||||
CHANGE_POINT_ON : ON -> type(ON);
|
||||
CHANGE_POINT_AS : AS -> type(AS);
|
||||
CHANGE_POINT_DOT: DOT -> type(DOT);
|
||||
CHANGE_POINT_COMMA: COMMA -> type(COMMA);
|
||||
CHANGE_POINT_QUOTED_IDENTIFIER: QUOTED_IDENTIFIER -> type(QUOTED_IDENTIFIER);
|
||||
CHANGE_POINT_UNQUOTED_IDENTIFIER: UNQUOTED_IDENTIFIER -> type(UNQUOTED_IDENTIFIER);
|
||||
CHANGE_POINT_LINE_COMMENT: LINE_COMMENT -> channel(HIDDEN);
|
||||
CHANGE_POINT_MULTILINE_COMMENT: MULTILINE_COMMENT -> channel(HIDDEN);
|
||||
CHANGE_POINT_WS: WS -> channel(HIDDEN);
|
||||
|
||||
//
|
||||
// INSIST command
|
||||
//
|
||||
mode INSIST_MODE;
|
||||
INSIST_PIPE : PIPE -> type(PIPE), popMode;
|
||||
INSIST_IDENTIFIER: UNQUOTED_IDENTIFIER -> type(UNQUOTED_IDENTIFIER);
|
||||
|
||||
INSIST_WS : WS -> channel(HIDDEN);
|
||||
INSIST_LINE_COMMENT : LINE_COMMENT -> channel(HIDDEN);
|
||||
INSIST_MULTILINE_COMMENT : MULTILINE_COMMENT -> channel(HIDDEN);
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -15,119 +15,127 @@ SORT=14
|
|||
STATS=15
|
||||
WHERE=16
|
||||
JOIN_LOOKUP=17
|
||||
DEV_INLINESTATS=18
|
||||
DEV_LOOKUP=19
|
||||
DEV_METRICS=20
|
||||
DEV_JOIN_FULL=21
|
||||
DEV_JOIN_LEFT=22
|
||||
DEV_JOIN_RIGHT=23
|
||||
UNKNOWN_CMD=24
|
||||
LINE_COMMENT=25
|
||||
MULTILINE_COMMENT=26
|
||||
WS=27
|
||||
PIPE=28
|
||||
QUOTED_STRING=29
|
||||
INTEGER_LITERAL=30
|
||||
DECIMAL_LITERAL=31
|
||||
BY=32
|
||||
AND=33
|
||||
ASC=34
|
||||
ASSIGN=35
|
||||
CAST_OP=36
|
||||
COLON=37
|
||||
COMMA=38
|
||||
DESC=39
|
||||
DOT=40
|
||||
FALSE=41
|
||||
FIRST=42
|
||||
IN=43
|
||||
IS=44
|
||||
LAST=45
|
||||
LIKE=46
|
||||
LP=47
|
||||
NOT=48
|
||||
NULL=49
|
||||
NULLS=50
|
||||
OR=51
|
||||
PARAM=52
|
||||
RLIKE=53
|
||||
RP=54
|
||||
TRUE=55
|
||||
EQ=56
|
||||
CIEQ=57
|
||||
NEQ=58
|
||||
LT=59
|
||||
LTE=60
|
||||
GT=61
|
||||
GTE=62
|
||||
PLUS=63
|
||||
MINUS=64
|
||||
ASTERISK=65
|
||||
SLASH=66
|
||||
PERCENT=67
|
||||
LEFT_BRACES=68
|
||||
RIGHT_BRACES=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
|
||||
EXPLAIN_WS=78
|
||||
EXPLAIN_LINE_COMMENT=79
|
||||
EXPLAIN_MULTILINE_COMMENT=80
|
||||
METADATA=81
|
||||
UNQUOTED_SOURCE=82
|
||||
FROM_LINE_COMMENT=83
|
||||
FROM_MULTILINE_COMMENT=84
|
||||
FROM_WS=85
|
||||
ID_PATTERN=86
|
||||
PROJECT_LINE_COMMENT=87
|
||||
PROJECT_MULTILINE_COMMENT=88
|
||||
PROJECT_WS=89
|
||||
AS=90
|
||||
RENAME_LINE_COMMENT=91
|
||||
RENAME_MULTILINE_COMMENT=92
|
||||
RENAME_WS=93
|
||||
ON=94
|
||||
WITH=95
|
||||
ENRICH_POLICY_NAME=96
|
||||
ENRICH_LINE_COMMENT=97
|
||||
ENRICH_MULTILINE_COMMENT=98
|
||||
ENRICH_WS=99
|
||||
ENRICH_FIELD_LINE_COMMENT=100
|
||||
ENRICH_FIELD_MULTILINE_COMMENT=101
|
||||
ENRICH_FIELD_WS=102
|
||||
MVEXPAND_LINE_COMMENT=103
|
||||
MVEXPAND_MULTILINE_COMMENT=104
|
||||
MVEXPAND_WS=105
|
||||
INFO=106
|
||||
SHOW_LINE_COMMENT=107
|
||||
SHOW_MULTILINE_COMMENT=108
|
||||
SHOW_WS=109
|
||||
SETTING=110
|
||||
SETTING_LINE_COMMENT=111
|
||||
SETTTING_MULTILINE_COMMENT=112
|
||||
SETTING_WS=113
|
||||
LOOKUP_LINE_COMMENT=114
|
||||
LOOKUP_MULTILINE_COMMENT=115
|
||||
LOOKUP_WS=116
|
||||
LOOKUP_FIELD_LINE_COMMENT=117
|
||||
LOOKUP_FIELD_MULTILINE_COMMENT=118
|
||||
LOOKUP_FIELD_WS=119
|
||||
JOIN=120
|
||||
USING=121
|
||||
JOIN_LINE_COMMENT=122
|
||||
JOIN_MULTILINE_COMMENT=123
|
||||
JOIN_WS=124
|
||||
METRICS_LINE_COMMENT=125
|
||||
METRICS_MULTILINE_COMMENT=126
|
||||
METRICS_WS=127
|
||||
CLOSING_METRICS_LINE_COMMENT=128
|
||||
CLOSING_METRICS_MULTILINE_COMMENT=129
|
||||
CLOSING_METRICS_WS=130
|
||||
DEV_CHANGE_POINT=18
|
||||
DEV_INLINESTATS=19
|
||||
DEV_INSIST=20
|
||||
DEV_LOOKUP=21
|
||||
DEV_METRICS=22
|
||||
DEV_JOIN_FULL=23
|
||||
DEV_JOIN_LEFT=24
|
||||
DEV_JOIN_RIGHT=25
|
||||
UNKNOWN_CMD=26
|
||||
LINE_COMMENT=27
|
||||
MULTILINE_COMMENT=28
|
||||
WS=29
|
||||
PIPE=30
|
||||
QUOTED_STRING=31
|
||||
INTEGER_LITERAL=32
|
||||
DECIMAL_LITERAL=33
|
||||
BY=34
|
||||
AND=35
|
||||
ASC=36
|
||||
ASSIGN=37
|
||||
CAST_OP=38
|
||||
COLON=39
|
||||
COMMA=40
|
||||
DESC=41
|
||||
DOT=42
|
||||
FALSE=43
|
||||
FIRST=44
|
||||
IN=45
|
||||
IS=46
|
||||
LAST=47
|
||||
LIKE=48
|
||||
LP=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
|
||||
LEFT_BRACES=70
|
||||
RIGHT_BRACES=71
|
||||
NAMED_OR_POSITIONAL_PARAM=72
|
||||
OPENING_BRACKET=73
|
||||
CLOSING_BRACKET=74
|
||||
UNQUOTED_IDENTIFIER=75
|
||||
QUOTED_IDENTIFIER=76
|
||||
EXPR_LINE_COMMENT=77
|
||||
EXPR_MULTILINE_COMMENT=78
|
||||
EXPR_WS=79
|
||||
EXPLAIN_WS=80
|
||||
EXPLAIN_LINE_COMMENT=81
|
||||
EXPLAIN_MULTILINE_COMMENT=82
|
||||
METADATA=83
|
||||
UNQUOTED_SOURCE=84
|
||||
FROM_LINE_COMMENT=85
|
||||
FROM_MULTILINE_COMMENT=86
|
||||
FROM_WS=87
|
||||
ID_PATTERN=88
|
||||
PROJECT_LINE_COMMENT=89
|
||||
PROJECT_MULTILINE_COMMENT=90
|
||||
PROJECT_WS=91
|
||||
AS=92
|
||||
RENAME_LINE_COMMENT=93
|
||||
RENAME_MULTILINE_COMMENT=94
|
||||
RENAME_WS=95
|
||||
ON=96
|
||||
WITH=97
|
||||
ENRICH_POLICY_NAME=98
|
||||
ENRICH_LINE_COMMENT=99
|
||||
ENRICH_MULTILINE_COMMENT=100
|
||||
ENRICH_WS=101
|
||||
ENRICH_FIELD_LINE_COMMENT=102
|
||||
ENRICH_FIELD_MULTILINE_COMMENT=103
|
||||
ENRICH_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
|
||||
SETTING=112
|
||||
SETTING_LINE_COMMENT=113
|
||||
SETTTING_MULTILINE_COMMENT=114
|
||||
SETTING_WS=115
|
||||
LOOKUP_LINE_COMMENT=116
|
||||
LOOKUP_MULTILINE_COMMENT=117
|
||||
LOOKUP_WS=118
|
||||
LOOKUP_FIELD_LINE_COMMENT=119
|
||||
LOOKUP_FIELD_MULTILINE_COMMENT=120
|
||||
LOOKUP_FIELD_WS=121
|
||||
JOIN=122
|
||||
USING=123
|
||||
JOIN_LINE_COMMENT=124
|
||||
JOIN_MULTILINE_COMMENT=125
|
||||
JOIN_WS=126
|
||||
METRICS_LINE_COMMENT=127
|
||||
METRICS_MULTILINE_COMMENT=128
|
||||
METRICS_WS=129
|
||||
CLOSING_METRICS_LINE_COMMENT=130
|
||||
CLOSING_METRICS_MULTILINE_COMMENT=131
|
||||
CLOSING_METRICS_WS=132
|
||||
CHANGE_POINT_LINE_COMMENT=133
|
||||
CHANGE_POINT_MULTILINE_COMMENT=134
|
||||
CHANGE_POINT_WS=135
|
||||
INSIST_WS=136
|
||||
INSIST_LINE_COMMENT=137
|
||||
INSIST_MULTILINE_COMMENT=138
|
||||
'dissect'=1
|
||||
'drop'=2
|
||||
'enrich'=3
|
||||
|
|
@ -145,50 +153,50 @@ CLOSING_METRICS_WS=130
|
|||
'stats'=15
|
||||
'where'=16
|
||||
'lookup'=17
|
||||
'|'=28
|
||||
'by'=32
|
||||
'and'=33
|
||||
'asc'=34
|
||||
'='=35
|
||||
'::'=36
|
||||
':'=37
|
||||
','=38
|
||||
'desc'=39
|
||||
'.'=40
|
||||
'false'=41
|
||||
'first'=42
|
||||
'in'=43
|
||||
'is'=44
|
||||
'last'=45
|
||||
'like'=46
|
||||
'('=47
|
||||
'not'=48
|
||||
'null'=49
|
||||
'nulls'=50
|
||||
'or'=51
|
||||
'?'=52
|
||||
'rlike'=53
|
||||
')'=54
|
||||
'true'=55
|
||||
'=='=56
|
||||
'=~'=57
|
||||
'!='=58
|
||||
'<'=59
|
||||
'<='=60
|
||||
'>'=61
|
||||
'>='=62
|
||||
'+'=63
|
||||
'-'=64
|
||||
'*'=65
|
||||
'/'=66
|
||||
'%'=67
|
||||
'{'=68
|
||||
'}'=69
|
||||
']'=72
|
||||
'metadata'=81
|
||||
'as'=90
|
||||
'on'=94
|
||||
'with'=95
|
||||
'info'=106
|
||||
'join'=120
|
||||
'USING'=121
|
||||
'|'=30
|
||||
'by'=34
|
||||
'and'=35
|
||||
'asc'=36
|
||||
'='=37
|
||||
'::'=38
|
||||
':'=39
|
||||
','=40
|
||||
'desc'=41
|
||||
'.'=42
|
||||
'false'=43
|
||||
'first'=44
|
||||
'in'=45
|
||||
'is'=46
|
||||
'last'=47
|
||||
'like'=48
|
||||
'('=49
|
||||
'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
|
||||
'{'=70
|
||||
'}'=71
|
||||
']'=74
|
||||
'metadata'=83
|
||||
'as'=92
|
||||
'on'=96
|
||||
'with'=97
|
||||
'info'=108
|
||||
'join'=122
|
||||
'USING'=123
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -57,6 +57,8 @@ processingCommand
|
|||
// in development
|
||||
| {this.isDevVersion()}? inlinestatsCommand
|
||||
| {this.isDevVersion()}? lookupCommand
|
||||
| {this.isDevVersion()}? changePointCommand
|
||||
| {this.isDevVersion()}? insistCommand
|
||||
;
|
||||
|
||||
whereCommand
|
||||
|
|
@ -340,4 +342,12 @@ joinCondition
|
|||
|
||||
joinPredicate
|
||||
: valueExpression
|
||||
;
|
||||
|
||||
changePointCommand
|
||||
: DEV_CHANGE_POINT value=qualifiedName (ON key=qualifiedName)? (AS targetType=qualifiedName COMMA targetPvalue=qualifiedName)?
|
||||
;
|
||||
|
||||
insistCommand
|
||||
: DEV_INSIST qualifiedNamePatterns
|
||||
;
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -15,119 +15,127 @@ SORT=14
|
|||
STATS=15
|
||||
WHERE=16
|
||||
JOIN_LOOKUP=17
|
||||
DEV_INLINESTATS=18
|
||||
DEV_LOOKUP=19
|
||||
DEV_METRICS=20
|
||||
DEV_JOIN_FULL=21
|
||||
DEV_JOIN_LEFT=22
|
||||
DEV_JOIN_RIGHT=23
|
||||
UNKNOWN_CMD=24
|
||||
LINE_COMMENT=25
|
||||
MULTILINE_COMMENT=26
|
||||
WS=27
|
||||
PIPE=28
|
||||
QUOTED_STRING=29
|
||||
INTEGER_LITERAL=30
|
||||
DECIMAL_LITERAL=31
|
||||
BY=32
|
||||
AND=33
|
||||
ASC=34
|
||||
ASSIGN=35
|
||||
CAST_OP=36
|
||||
COLON=37
|
||||
COMMA=38
|
||||
DESC=39
|
||||
DOT=40
|
||||
FALSE=41
|
||||
FIRST=42
|
||||
IN=43
|
||||
IS=44
|
||||
LAST=45
|
||||
LIKE=46
|
||||
LP=47
|
||||
NOT=48
|
||||
NULL=49
|
||||
NULLS=50
|
||||
OR=51
|
||||
PARAM=52
|
||||
RLIKE=53
|
||||
RP=54
|
||||
TRUE=55
|
||||
EQ=56
|
||||
CIEQ=57
|
||||
NEQ=58
|
||||
LT=59
|
||||
LTE=60
|
||||
GT=61
|
||||
GTE=62
|
||||
PLUS=63
|
||||
MINUS=64
|
||||
ASTERISK=65
|
||||
SLASH=66
|
||||
PERCENT=67
|
||||
LEFT_BRACES=68
|
||||
RIGHT_BRACES=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
|
||||
EXPLAIN_WS=78
|
||||
EXPLAIN_LINE_COMMENT=79
|
||||
EXPLAIN_MULTILINE_COMMENT=80
|
||||
METADATA=81
|
||||
UNQUOTED_SOURCE=82
|
||||
FROM_LINE_COMMENT=83
|
||||
FROM_MULTILINE_COMMENT=84
|
||||
FROM_WS=85
|
||||
ID_PATTERN=86
|
||||
PROJECT_LINE_COMMENT=87
|
||||
PROJECT_MULTILINE_COMMENT=88
|
||||
PROJECT_WS=89
|
||||
AS=90
|
||||
RENAME_LINE_COMMENT=91
|
||||
RENAME_MULTILINE_COMMENT=92
|
||||
RENAME_WS=93
|
||||
ON=94
|
||||
WITH=95
|
||||
ENRICH_POLICY_NAME=96
|
||||
ENRICH_LINE_COMMENT=97
|
||||
ENRICH_MULTILINE_COMMENT=98
|
||||
ENRICH_WS=99
|
||||
ENRICH_FIELD_LINE_COMMENT=100
|
||||
ENRICH_FIELD_MULTILINE_COMMENT=101
|
||||
ENRICH_FIELD_WS=102
|
||||
MVEXPAND_LINE_COMMENT=103
|
||||
MVEXPAND_MULTILINE_COMMENT=104
|
||||
MVEXPAND_WS=105
|
||||
INFO=106
|
||||
SHOW_LINE_COMMENT=107
|
||||
SHOW_MULTILINE_COMMENT=108
|
||||
SHOW_WS=109
|
||||
SETTING=110
|
||||
SETTING_LINE_COMMENT=111
|
||||
SETTTING_MULTILINE_COMMENT=112
|
||||
SETTING_WS=113
|
||||
LOOKUP_LINE_COMMENT=114
|
||||
LOOKUP_MULTILINE_COMMENT=115
|
||||
LOOKUP_WS=116
|
||||
LOOKUP_FIELD_LINE_COMMENT=117
|
||||
LOOKUP_FIELD_MULTILINE_COMMENT=118
|
||||
LOOKUP_FIELD_WS=119
|
||||
JOIN=120
|
||||
USING=121
|
||||
JOIN_LINE_COMMENT=122
|
||||
JOIN_MULTILINE_COMMENT=123
|
||||
JOIN_WS=124
|
||||
METRICS_LINE_COMMENT=125
|
||||
METRICS_MULTILINE_COMMENT=126
|
||||
METRICS_WS=127
|
||||
CLOSING_METRICS_LINE_COMMENT=128
|
||||
CLOSING_METRICS_MULTILINE_COMMENT=129
|
||||
CLOSING_METRICS_WS=130
|
||||
DEV_CHANGE_POINT=18
|
||||
DEV_INLINESTATS=19
|
||||
DEV_INSIST=20
|
||||
DEV_LOOKUP=21
|
||||
DEV_METRICS=22
|
||||
DEV_JOIN_FULL=23
|
||||
DEV_JOIN_LEFT=24
|
||||
DEV_JOIN_RIGHT=25
|
||||
UNKNOWN_CMD=26
|
||||
LINE_COMMENT=27
|
||||
MULTILINE_COMMENT=28
|
||||
WS=29
|
||||
PIPE=30
|
||||
QUOTED_STRING=31
|
||||
INTEGER_LITERAL=32
|
||||
DECIMAL_LITERAL=33
|
||||
BY=34
|
||||
AND=35
|
||||
ASC=36
|
||||
ASSIGN=37
|
||||
CAST_OP=38
|
||||
COLON=39
|
||||
COMMA=40
|
||||
DESC=41
|
||||
DOT=42
|
||||
FALSE=43
|
||||
FIRST=44
|
||||
IN=45
|
||||
IS=46
|
||||
LAST=47
|
||||
LIKE=48
|
||||
LP=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
|
||||
LEFT_BRACES=70
|
||||
RIGHT_BRACES=71
|
||||
NAMED_OR_POSITIONAL_PARAM=72
|
||||
OPENING_BRACKET=73
|
||||
CLOSING_BRACKET=74
|
||||
UNQUOTED_IDENTIFIER=75
|
||||
QUOTED_IDENTIFIER=76
|
||||
EXPR_LINE_COMMENT=77
|
||||
EXPR_MULTILINE_COMMENT=78
|
||||
EXPR_WS=79
|
||||
EXPLAIN_WS=80
|
||||
EXPLAIN_LINE_COMMENT=81
|
||||
EXPLAIN_MULTILINE_COMMENT=82
|
||||
METADATA=83
|
||||
UNQUOTED_SOURCE=84
|
||||
FROM_LINE_COMMENT=85
|
||||
FROM_MULTILINE_COMMENT=86
|
||||
FROM_WS=87
|
||||
ID_PATTERN=88
|
||||
PROJECT_LINE_COMMENT=89
|
||||
PROJECT_MULTILINE_COMMENT=90
|
||||
PROJECT_WS=91
|
||||
AS=92
|
||||
RENAME_LINE_COMMENT=93
|
||||
RENAME_MULTILINE_COMMENT=94
|
||||
RENAME_WS=95
|
||||
ON=96
|
||||
WITH=97
|
||||
ENRICH_POLICY_NAME=98
|
||||
ENRICH_LINE_COMMENT=99
|
||||
ENRICH_MULTILINE_COMMENT=100
|
||||
ENRICH_WS=101
|
||||
ENRICH_FIELD_LINE_COMMENT=102
|
||||
ENRICH_FIELD_MULTILINE_COMMENT=103
|
||||
ENRICH_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
|
||||
SETTING=112
|
||||
SETTING_LINE_COMMENT=113
|
||||
SETTTING_MULTILINE_COMMENT=114
|
||||
SETTING_WS=115
|
||||
LOOKUP_LINE_COMMENT=116
|
||||
LOOKUP_MULTILINE_COMMENT=117
|
||||
LOOKUP_WS=118
|
||||
LOOKUP_FIELD_LINE_COMMENT=119
|
||||
LOOKUP_FIELD_MULTILINE_COMMENT=120
|
||||
LOOKUP_FIELD_WS=121
|
||||
JOIN=122
|
||||
USING=123
|
||||
JOIN_LINE_COMMENT=124
|
||||
JOIN_MULTILINE_COMMENT=125
|
||||
JOIN_WS=126
|
||||
METRICS_LINE_COMMENT=127
|
||||
METRICS_MULTILINE_COMMENT=128
|
||||
METRICS_WS=129
|
||||
CLOSING_METRICS_LINE_COMMENT=130
|
||||
CLOSING_METRICS_MULTILINE_COMMENT=131
|
||||
CLOSING_METRICS_WS=132
|
||||
CHANGE_POINT_LINE_COMMENT=133
|
||||
CHANGE_POINT_MULTILINE_COMMENT=134
|
||||
CHANGE_POINT_WS=135
|
||||
INSIST_WS=136
|
||||
INSIST_LINE_COMMENT=137
|
||||
INSIST_MULTILINE_COMMENT=138
|
||||
'dissect'=1
|
||||
'drop'=2
|
||||
'enrich'=3
|
||||
|
|
@ -145,50 +153,50 @@ CLOSING_METRICS_WS=130
|
|||
'stats'=15
|
||||
'where'=16
|
||||
'lookup'=17
|
||||
'|'=28
|
||||
'by'=32
|
||||
'and'=33
|
||||
'asc'=34
|
||||
'='=35
|
||||
'::'=36
|
||||
':'=37
|
||||
','=38
|
||||
'desc'=39
|
||||
'.'=40
|
||||
'false'=41
|
||||
'first'=42
|
||||
'in'=43
|
||||
'is'=44
|
||||
'last'=45
|
||||
'like'=46
|
||||
'('=47
|
||||
'not'=48
|
||||
'null'=49
|
||||
'nulls'=50
|
||||
'or'=51
|
||||
'?'=52
|
||||
'rlike'=53
|
||||
')'=54
|
||||
'true'=55
|
||||
'=='=56
|
||||
'=~'=57
|
||||
'!='=58
|
||||
'<'=59
|
||||
'<='=60
|
||||
'>'=61
|
||||
'>='=62
|
||||
'+'=63
|
||||
'-'=64
|
||||
'*'=65
|
||||
'/'=66
|
||||
'%'=67
|
||||
'{'=68
|
||||
'}'=69
|
||||
']'=72
|
||||
'metadata'=81
|
||||
'as'=90
|
||||
'on'=94
|
||||
'with'=95
|
||||
'info'=106
|
||||
'join'=120
|
||||
'USING'=121
|
||||
'|'=30
|
||||
'by'=34
|
||||
'and'=35
|
||||
'asc'=36
|
||||
'='=37
|
||||
'::'=38
|
||||
':'=39
|
||||
','=40
|
||||
'desc'=41
|
||||
'.'=42
|
||||
'false'=43
|
||||
'first'=44
|
||||
'in'=45
|
||||
'is'=46
|
||||
'last'=47
|
||||
'like'=48
|
||||
'('=49
|
||||
'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
|
||||
'{'=70
|
||||
'}'=71
|
||||
']'=74
|
||||
'metadata'=83
|
||||
'as'=92
|
||||
'on'=96
|
||||
'with'=97
|
||||
'info'=108
|
||||
'join'=122
|
||||
'USING'=123
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -102,6 +102,8 @@ import { JoinCommandContext } from "./esql_parser.js";
|
|||
import { JoinTargetContext } from "./esql_parser.js";
|
||||
import { JoinConditionContext } from "./esql_parser.js";
|
||||
import { JoinPredicateContext } from "./esql_parser.js";
|
||||
import { ChangePointCommandContext } from "./esql_parser.js";
|
||||
import { InsistCommandContext } from "./esql_parser.js";
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -1075,5 +1077,25 @@ export default class esql_parserListener extends ParseTreeListener {
|
|||
* @param ctx the parse tree
|
||||
*/
|
||||
exitJoinPredicate?: (ctx: JoinPredicateContext) => void;
|
||||
/**
|
||||
* Enter a parse tree produced by `esql_parser.changePointCommand`.
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
enterChangePointCommand?: (ctx: ChangePointCommandContext) => void;
|
||||
/**
|
||||
* Exit a parse tree produced by `esql_parser.changePointCommand`.
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
exitChangePointCommand?: (ctx: ChangePointCommandContext) => void;
|
||||
/**
|
||||
* Enter a parse tree produced by `esql_parser.insistCommand`.
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
enterInsistCommand?: (ctx: InsistCommandContext) => void;
|
||||
/**
|
||||
* Exit a parse tree produced by `esql_parser.insistCommand`.
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
exitInsistCommand?: (ctx: InsistCommandContext) => void;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -103,6 +103,8 @@ describe('ESQL Theme', () => {
|
|||
'metrics_ws',
|
||||
'closing_metrics_ws',
|
||||
'join_ws',
|
||||
'change_point_ws',
|
||||
'insist_ws',
|
||||
];
|
||||
|
||||
// First, check that every valid exception is actually valid
|
||||
|
|
|
|||
|
|
@ -86,6 +86,8 @@ export const buildESQLTheme = ({
|
|||
'nulls_order',
|
||||
'join_lookup',
|
||||
'join',
|
||||
'dev_change_point',
|
||||
'dev_insist',
|
||||
],
|
||||
euiTheme.colors.accent,
|
||||
true // isBold
|
||||
|
|
@ -154,6 +156,10 @@ export const buildESQLTheme = ({
|
|||
'metrics_multiline_comment',
|
||||
'closing_metrics_line_comment',
|
||||
'closing_metrics_multiline_comment',
|
||||
'change_point_line_comment',
|
||||
'change_point_multiline_comment',
|
||||
'insist_line_comment',
|
||||
'insist_multiline_comment',
|
||||
],
|
||||
euiTheme.colors.textSubdued
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue