Do not require WS around subquery expressions (#262)

elastic · Oct 4, 2022 · f95123d · f95123d
1 parent 97f214c
commit f95123d
Show file tree

Hide file tree

Showing 8 changed files with 416 additions and 421 deletions.
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4
@@ -8,7 +8,6 @@ STATS : 'stats' -> pushMode(EXPRESSION);
 WHERE : 'where' -> pushMode(EXPRESSION);
 SORT : 'sort' -> pushMode(EXPRESSION);
 LIMIT : 'limit' -> pushMode(EXPRESSION);
-UNKNOWN_COMMAND : ~[ \r\n\t]+ -> pushMode(EXPRESSION);
 
 LINE_COMMENT
     : '//' ~[\r\n]* '\r'? '\n'? -> channel(HIDDEN)
@@ -127,7 +126,7 @@ SRC_CLOSING_BRACKET : ']' -> popMode, popMode, type(CLOSING_BRACKET);
 SRC_COMMA : ',' -> type(COMMA);
 
 SRC_UNQUOTED_IDENTIFIER
-    : ~[`|., \t\r\n]+
+    : ~[`|., [\]\t\r\n]+
     ;
 
 SRC_QUOTED_IDENTIFIER

diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens b/x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens
@@ -6,54 +6,53 @@ STATS=5
 WHERE=6
 SORT=7
 LIMIT=8
-UNKNOWN_COMMAND=9
-LINE_COMMENT=10
-MULTILINE_COMMENT=11
-WS=12
-PIPE=13
-STRING=14
-INTEGER_LITERAL=15
-DECIMAL_LITERAL=16
-BY=17
-AND=18
-ASC=19
-ASSIGN=20
-COMMA=21
-DESC=22
-DOT=23
-FALSE=24
-FIRST=25
-LAST=26
-LP=27
-OPENING_BRACKET=28
-CLOSING_BRACKET=29
-NOT=30
-NULL=31
-NULLS=32
-OR=33
-RP=34
-TRUE=35
-EQ=36
-NEQ=37
-LT=38
-LTE=39
-GT=40
-GTE=41
-PLUS=42
-MINUS=43
-ASTERISK=44
-SLASH=45
-PERCENT=46
-UNQUOTED_IDENTIFIER=47
-QUOTED_IDENTIFIER=48
-EXPR_LINE_COMMENT=49
-EXPR_MULTILINE_COMMENT=50
-EXPR_WS=51
-SRC_UNQUOTED_IDENTIFIER=52
-SRC_QUOTED_IDENTIFIER=53
-SRC_LINE_COMMENT=54
-SRC_MULTILINE_COMMENT=55
-SRC_WS=56
+LINE_COMMENT=9
+MULTILINE_COMMENT=10
+WS=11
+PIPE=12
+STRING=13
+INTEGER_LITERAL=14
+DECIMAL_LITERAL=15
+BY=16
+AND=17
+ASC=18
+ASSIGN=19
+COMMA=20
+DESC=21
+DOT=22
+FALSE=23
+FIRST=24
+LAST=25
+LP=26
+OPENING_BRACKET=27
+CLOSING_BRACKET=28
+NOT=29
+NULL=30
+NULLS=31
+OR=32
+RP=33
+TRUE=34
+EQ=35
+NEQ=36
+LT=37
+LTE=38
+GT=39
+GTE=40
+PLUS=41
+MINUS=42
+ASTERISK=43
+SLASH=44
+PERCENT=45
+UNQUOTED_IDENTIFIER=46
+QUOTED_IDENTIFIER=47
+EXPR_LINE_COMMENT=48
+EXPR_MULTILINE_COMMENT=49
+EXPR_WS=50
+SRC_UNQUOTED_IDENTIFIER=51
+SRC_QUOTED_IDENTIFIER=52
+SRC_LINE_COMMENT=53
+SRC_MULTILINE_COMMENT=54
+SRC_WS=55
 'eval'=1
 'explain'=2
 'from'=3
@@ -62,32 +61,32 @@ SRC_WS=56
 'where'=6
 'sort'=7
 'limit'=8
-'by'=17
-'and'=18
-'asc'=19
-'='=20
-'desc'=22
-'.'=23
-'false'=24
-'first'=25
-'last'=26
-'('=27
-'['=28
-']'=29
-'not'=30
-'null'=31
-'nulls'=32
-'or'=33
-')'=34
-'true'=35
-'=='=36
-'!='=37
-'<'=38
-'<='=39
-'>'=40
-'>='=41
-'+'=42
-'-'=43
-'*'=44
-'/'=45
-'%'=46
+'by'=16
+'and'=17
+'asc'=18
+'='=19
+'desc'=21
+'.'=22
+'false'=23
+'first'=24
+'last'=25
+'('=26
+'['=27
+']'=28
+'not'=29
+'null'=30
+'nulls'=31
+'or'=32
+')'=33
+'true'=34
+'=='=35
+'!='=36
+'<'=37
+'<='=38
+'>'=39
+'>='=40
+'+'=41
+'-'=42
+'*'=43
+'/'=44
+'%'=45
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens
@@ -6,54 +6,53 @@ STATS=5
 WHERE=6
 SORT=7
 LIMIT=8
-UNKNOWN_COMMAND=9
-LINE_COMMENT=10
-MULTILINE_COMMENT=11
-WS=12
-PIPE=13
-STRING=14
-INTEGER_LITERAL=15
-DECIMAL_LITERAL=16
-BY=17
-AND=18
-ASC=19
-ASSIGN=20
-COMMA=21
-DESC=22
-DOT=23
-FALSE=24
-FIRST=25
-LAST=26
-LP=27
-OPENING_BRACKET=28
-CLOSING_BRACKET=29
-NOT=30
-NULL=31
-NULLS=32
-OR=33
-RP=34
-TRUE=35
-EQ=36
-NEQ=37
-LT=38
-LTE=39
-GT=40
-GTE=41
-PLUS=42
-MINUS=43
-ASTERISK=44
-SLASH=45
-PERCENT=46
-UNQUOTED_IDENTIFIER=47
-QUOTED_IDENTIFIER=48
-EXPR_LINE_COMMENT=49
-EXPR_MULTILINE_COMMENT=50
-EXPR_WS=51
-SRC_UNQUOTED_IDENTIFIER=52
-SRC_QUOTED_IDENTIFIER=53
-SRC_LINE_COMMENT=54
-SRC_MULTILINE_COMMENT=55
-SRC_WS=56
+LINE_COMMENT=9
+MULTILINE_COMMENT=10
+WS=11
+PIPE=12
+STRING=13
+INTEGER_LITERAL=14
+DECIMAL_LITERAL=15
+BY=16
+AND=17
+ASC=18
+ASSIGN=19
+COMMA=20
+DESC=21
+DOT=22
+FALSE=23
+FIRST=24
+LAST=25
+LP=26
+OPENING_BRACKET=27
+CLOSING_BRACKET=28
+NOT=29
+NULL=30
+NULLS=31
+OR=32
+RP=33
+TRUE=34
+EQ=35
+NEQ=36
+LT=37
+LTE=38
+GT=39
+GTE=40
+PLUS=41
+MINUS=42
+ASTERISK=43
+SLASH=44
+PERCENT=45
+UNQUOTED_IDENTIFIER=46
+QUOTED_IDENTIFIER=47
+EXPR_LINE_COMMENT=48
+EXPR_MULTILINE_COMMENT=49
+EXPR_WS=50
+SRC_UNQUOTED_IDENTIFIER=51
+SRC_QUOTED_IDENTIFIER=52
+SRC_LINE_COMMENT=53
+SRC_MULTILINE_COMMENT=54
+SRC_WS=55
 'eval'=1
 'explain'=2
 'from'=3
@@ -62,31 +61,32 @@ SRC_WS=56
 'where'=6
 'sort'=7
 'limit'=8
-'by'=17
-'and'=18
-'asc'=19
-'='=20
-'desc'=22
-'.'=23
-'false'=24
-'first'=25
-'last'=26
-'('=27
-'['=28
-'not'=30
-'null'=31
-'nulls'=32
-'or'=33
-')'=34
-'true'=35
-'=='=36
-'!='=37
-'<'=38
-'<='=39
-'>'=40
-'>='=41
-'+'=42
-'-'=43
-'*'=44
-'/'=45
-'%'=46
+'by'=16
+'and'=17
+'asc'=18
+'='=19
+'desc'=21
+'.'=22
+'false'=23
+'first'=24
+'last'=25
+'('=26
+'['=27
+']'=28
+'not'=29
+'null'=30
+'nulls'=31
+'or'=32
+')'=33
+'true'=34
+'=='=35
+'!='=36
+'<'=37
+'<='=38
+'>'=39
+'>='=40
+'+'=41
+'-'=42
+'*'=43
+'/'=44
+'%'=45
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp