Merge pull request #466 from allwefantasy/mlsql

修正include语句在严格语法模式下的问题；where 和options现在是等价； train 和run 是等价
byzer-org · Aug 29, 2018 · 61be955 · 61be955
2 parents 0d68a42 + af1b6db
commit 61be955
Show file tree

Hide file tree

Showing 13 changed files with 1,044 additions and 860 deletions.
diff --git a/streamingpro-dsl-legacy/src/main/java/streaming/dsl/parser/DSLSQL.tokens b/streamingpro-dsl-legacy/src/main/java/streaming/dsl/parser/DSLSQL.tokens
@@ -36,51 +36,55 @@ T__34=35
 T__35=36
 T__36=37
 T__37=38
-STRING=39
-BLOCK_STRING=40
-IDENTIFIER=41
-BACKQUOTED_IDENTIFIER=42
-SIMPLE_COMMENT=43
-BRACKETED_EMPTY_COMMENT=44
-BRACKETED_COMMENT=45
-WS=46
-UNRECOGNIZED=47
+T__38=39
+T__39=40
+STRING=41
+BLOCK_STRING=42
+IDENTIFIER=43
+BACKQUOTED_IDENTIFIER=44
+SIMPLE_COMMENT=45
+BRACKETED_EMPTY_COMMENT=46
+BRACKETED_COMMENT=47
+WS=48
+UNRECOGNIZED=49
 'load'=1
 'LOAD'=2
 '.'=3
 'options'=4
-'as'=5
-'save'=6
-'SAVE'=7
-'partitionBy'=8
-'select'=9
-'SELECT'=10
-';'=11
-'insert'=12
-'INSERT'=13
-'create'=14
-'CREATE'=15
-'drop'=16
-'DROP'=17
-'refresh'=18
-'REFRESH'=19
-'set'=20
-'SET'=21
-'='=22
-'connect'=23
-'CONNECT'=24
-'where'=25
+'where'=5
+'as'=6
+'save'=7
+'SAVE'=8
+'partitionBy'=9
+'select'=10
+'SELECT'=11
+';'=12
+'insert'=13
+'INSERT'=14
+'create'=15
+'CREATE'=16
+'drop'=17
+'DROP'=18
+'refresh'=19
+'REFRESH'=20
+'set'=21
+'SET'=22
+'='=23
+'connect'=24
+'CONNECT'=25
 'train'=26
 'TRAIN'=27
-'register'=28
-'REGISTER'=29
-'unRegister'=30
-'UNREGISTER'=31
-'include'=32
-'INCLUDE'=33
-'overwrite'=34
-'append'=35
-'errorIfExists'=36
-'ignore'=37
-'and'=38
-'/**/'=44
+'run'=28
+'RUN'=29
+'register'=30
+'REGISTER'=31
+'unRegister'=32
+'UNREGISTER'=33
+'include'=34
+'INCLUDE'=35
+'overwrite'=36
+'append'=37
+'errorIfExists'=38
+'ignore'=39
+'and'=40
+'/**/'=46
diff --git a/streamingpro-dsl-legacy/src/main/java/streaming/dsl/parser/DSLSQLLexer.java b/streamingpro-dsl-legacy/src/main/java/streaming/dsl/parser/DSLSQLLexer.java
diff --git a/streamingpro-dsl-legacy/src/main/java/streaming/dsl/parser/DSLSQLLexer.tokens b/streamingpro-dsl-legacy/src/main/java/streaming/dsl/parser/DSLSQLLexer.tokens
@@ -36,51 +36,55 @@ T__34=35
 T__35=36
 T__36=37
 T__37=38
-STRING=39
-BLOCK_STRING=40
-IDENTIFIER=41
-BACKQUOTED_IDENTIFIER=42
-SIMPLE_COMMENT=43
-BRACKETED_EMPTY_COMMENT=44
-BRACKETED_COMMENT=45
-WS=46
-UNRECOGNIZED=47
+T__38=39
+T__39=40
+STRING=41
+BLOCK_STRING=42
+IDENTIFIER=43
+BACKQUOTED_IDENTIFIER=44
+SIMPLE_COMMENT=45
+BRACKETED_EMPTY_COMMENT=46
+BRACKETED_COMMENT=47
+WS=48
+UNRECOGNIZED=49
 'load'=1
 'LOAD'=2
 '.'=3
 'options'=4
-'as'=5
-'save'=6
-'SAVE'=7
-'partitionBy'=8
-'select'=9
-'SELECT'=10
-';'=11
-'insert'=12
-'INSERT'=13
-'create'=14
-'CREATE'=15
-'drop'=16
-'DROP'=17
-'refresh'=18
-'REFRESH'=19
-'set'=20
-'SET'=21
-'='=22
-'connect'=23
-'CONNECT'=24
-'where'=25
+'where'=5
+'as'=6
+'save'=7
+'SAVE'=8
+'partitionBy'=9
+'select'=10
+'SELECT'=11
+';'=12
+'insert'=13
+'INSERT'=14
+'create'=15
+'CREATE'=16
+'drop'=17
+'DROP'=18
+'refresh'=19
+'REFRESH'=20
+'set'=21
+'SET'=22
+'='=23
+'connect'=24
+'CONNECT'=25
 'train'=26
 'TRAIN'=27
-'register'=28
-'REGISTER'=29
-'unRegister'=30
-'UNREGISTER'=31
-'include'=32
-'INCLUDE'=33
-'overwrite'=34
-'append'=35
-'errorIfExists'=36
-'ignore'=37
-'and'=38
-'/**/'=44
+'run'=28
+'RUN'=29
+'register'=30
+'REGISTER'=31
+'unRegister'=32
+'UNREGISTER'=33
+'include'=34
+'INCLUDE'=35
+'overwrite'=36
+'append'=37
+'errorIfExists'=38
+'ignore'=39
+'and'=40
+'/**/'=46