oushu/lava-oushudb-dt-sql-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: #295 #297 optimize impala data types suggestion and create table (#296)

Browse Source 
* fix: #295 impala data types suggestion

* fix: #297 impala create table with STRUCT
This commit is contained in:
琉易 2024-04-21 12:10:36 +08:00 committed by GitHub
parent fa30fe9253
commit 31b57a494b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 5738 additions and 5248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/grammar/impala/ImpalaSqlLexer.g4
View File

@ -151,7 +151,6 @@ KW_LOAD : 'LOAD';
KW_LOCALTIME : 'LOCALTIME'; KW_LOCALTIME : 'LOCALTIME';
KW_LOCALTIMESTAMP : 'LOCALTIMESTAMP'; KW_LOCALTIMESTAMP : 'LOCALTIMESTAMP';
KW_METADATA : 'METADATA'; KW_METADATA : 'METADATA';
KW_MAP : 'MAP';
KW_MINUTE : 'MINUTE'; KW_MINUTE : 'MINUTE';
KW_MINUTES : 'MINUTES'; KW_MINUTES : 'MINUTES';
KW_MONTH : 'MONTH'; KW_MONTH : 'MONTH';
@ -213,7 +212,6 @@ KW_SHOW : 'SHOW';
KW_SHUTDOWN : 'SHUTDOWN'; KW_SHUTDOWN : 'SHUTDOWN';
KW_SOME : 'SOME'; KW_SOME : 'SOME';
KW_STATS : 'STATS'; KW_STATS : 'STATS';
KW_STRUCT : 'STRUCT';
KW_STRAIGHT_JOIN : 'STRAIGHT_JOIN'; KW_STRAIGHT_JOIN : 'STRAIGHT_JOIN';
KW_SUBSTRING : 'SUBSTRING'; KW_SUBSTRING : 'SUBSTRING';
KW_SYSTEM : 'SYSTEM'; KW_SYSTEM : 'SYSTEM';
@ -259,6 +257,26 @@ KW_REFERENCES : 'REFERENCES';
KW_NOVALIDATE : 'NOVALIDATE'; KW_NOVALIDATE : 'NOVALIDATE';
KW_RELY : 'RELY'; KW_RELY : 'RELY';
// dataType
KW_BINARY : 'BINARY';
KW_BIGINT : 'BIGINT';
KW_BOOLEAN : 'BOOLEAN';
KW_CHAR : 'CHAR';
KW_DATE : 'DATE';
KW_DECIMAL : 'DECIMAL';
KW_DOUBLE : 'DOUBLE';
KW_INT : 'INT';
KW_MAP : 'MAP';
KW_REAL : 'REAL';
KW_SMALLINT : 'SMALLINT';
KW_FLOAT : 'FLOAT';
KW_STRING : 'STRING';
KW_STRUCT : 'STRUCT';
KW_TIMESTAMP : 'TIMESTAMP';
KW_TINYINT : 'TINYINT';
KW_VARCHAR : 'VARCHAR';
KW_COMPLEX : 'COMPLEX';
STATS_NUMDVS : '\'NUMDVS\''; STATS_NUMDVS : '\'NUMDVS\'';
STATS_NUMNULLS : '\'NUMNULLS\''; STATS_NUMNULLS : '\'NUMNULLS\'';
STATS_AVGSIZE : '\'AVGSIZE\''; STATS_AVGSIZE : '\'AVGSIZE\'';

29
src/grammar/impala/ImpalaSqlParser.g4
View File

@ -265,7 +265,7 @@ computeStats
; ;
computeIncrementalStats computeIncrementalStats
: KW_COMPUTE KW_INCREMENTAL KW_STATS tableNamePath (KW_PARTITION expression)? : KW_COMPUTE KW_INCREMENTAL KW_STATS tableNamePath (KW_PARTITION LPAREN expression RPAREN)?
; ;
dropStatement dropStatement
@ -1003,8 +1003,30 @@ type
: type KW_ARRAY : type KW_ARRAY
| KW_ARRAY LT type GT | KW_ARRAY LT type GT
| KW_MAP LT type COMMA type GT | KW_MAP LT type COMMA type GT
| KW_STRUCT LT identifier COLON type (COMMA identifier COLON type)* GT | KW_STRUCT LT identifier type (COMMA identifier type)* GT
| baseType (LPAREN typeParameter (COMMA typeParameter)* RPAREN)? | (baseType | dataType) (LPAREN typeParameter (COMMA typeParameter)* RPAREN)?
;
dataType
: KW_ARRAY
| KW_BINARY
| KW_BIGINT
| KW_BOOLEAN
| KW_CHAR
| KW_DATE
| KW_DECIMAL
| KW_DOUBLE
| KW_FLOAT
| KW_INT
| KW_MAP
| KW_REAL
| KW_SMALLINT
| KW_STRING
| KW_STRUCT
| KW_TIMESTAMP
| KW_TINYINT
| KW_VARCHAR
| KW_COMPLEX
; ;
typeParameter typeParameter
@ -1125,6 +1147,7 @@ nonReserved
// IMPORTANT: this rule must only contain tokens. Nested rules are not supported. See SqlParser.exitNonReserved // IMPORTANT: this rule must only contain tokens. Nested rules are not supported. See SqlParser.exitNonReserved
: KW_BERNOULLI : KW_BERNOULLI
| KW_DAY | KW_DAY
| KW_DATE
| KW_DAYS | KW_DAYS
| KW_EXCLUDING | KW_EXCLUDING
| KW_HOUR | KW_HOUR

62
src/lib/impala/ImpalaSqlLexer.interp
View File

File diff suppressed because one or more lines are too long

606
src/lib/impala/ImpalaSqlLexer.tokens
View File

@ -119,158 +119,174 @@ KW_LOAD=118
KW_LOCALTIME=119 KW_LOCALTIME=119
KW_LOCALTIMESTAMP=120 KW_LOCALTIMESTAMP=120
KW_METADATA=121 KW_METADATA=121
KW_MAP=122 KW_MINUTE=122
KW_MINUTE=123 KW_MINUTES=123
KW_MINUTES=124 KW_MONTH=124
KW_MONTH=125 KW_MONTHS=125
KW_MONTHS=126 KW_MERGE_FN=126
KW_MERGE_FN=127 KW_NFC=127
KW_NFC=128 KW_NFD=128
KW_NFD=129 KW_NFKC=129
KW_NFKC=130 KW_NFKD=130
KW_NFKD=131 KW_NORMALIZE=131
KW_NORMALIZE=132 KW_NOT=132
KW_NOT=133 KW_NULL=133
KW_NULL=134 KW_NULLS=134
KW_NULLS=135 KW_OFFSET=135
KW_OFFSET=136 KW_ON=136
KW_ON=137 KW_OPTION=137
KW_OPTION=138 KW_OR=138
KW_OR=139 KW_ORDER=139
KW_ORDER=140 KW_ORDINALITY=140
KW_ORDINALITY=141 KW_OUTER=141
KW_OUTER=142 KW_OWNER=142
KW_OWNER=143 KW_OVER=143
KW_OVER=144 KW_OVERWRITE=144
KW_OVERWRITE=145 KW_PARTITION=145
KW_PARTITION=146 KW_PARTITIONS=146
KW_PARTITIONS=147 KW_PARQUET=147
KW_PARQUET=148 KW_POSITION=148
KW_POSITION=149 KW_PRECEDING=149
KW_PRECEDING=150 KW_PRIMARY=150
KW_PRIMARY=151 KW_REPLICATION=151
KW_REPLICATION=152 KW_PRIVILEGES=152
KW_PRIVILEGES=153 KW_PROPERTIES=153
KW_PROPERTIES=154 KW_RANGE=154
KW_RANGE=155 KW_RECOVER=155
KW_RECOVER=156 KW_RENAME=156
KW_RENAME=157 KW_REPEATABLE=157
KW_REPEATABLE=158 KW_REPLACE=158
KW_REPLACE=159 KW_RESTRICT=159
KW_RESTRICT=160 KW_RETURNS=160
KW_RETURNS=161 KW_REVOKE=161
KW_REVOKE=162 KW_REFRESH=162
KW_REFRESH=163 KW_REGEXP=163
KW_REGEXP=164 KW_RLIKE=164
KW_RLIKE=165 KW_RIGHT=165
KW_RIGHT=166 KW_ROLE=166
KW_ROLE=167 KW_ROLES=167
KW_ROLES=168 KW_ROW=168
KW_ROW=169 KW_ROWS=169
KW_ROWS=170 KW_SCHEMA=170
KW_SCHEMA=171 KW_SCHEMAS=171
KW_SCHEMAS=172 KW_SECOND=172
KW_SECOND=173 KW_SECONDS=173
KW_SECONDS=174 KW_SELECT=174
KW_SELECT=175 KW_SERDEPROPERTIES=175
KW_SERDEPROPERTIES=176 KW_SET=176
KW_SET=177 KW_SEMI=177
KW_SEMI=178 KW_SERVER=178
KW_SERVER=179 KW_SHOW=179
KW_SHOW=180 KW_SHUTDOWN=180
KW_SHUTDOWN=181 KW_SOME=181
KW_SOME=182 KW_STATS=182
KW_STATS=183 KW_STRAIGHT_JOIN=183
KW_STRUCT=184 KW_SUBSTRING=184
KW_STRAIGHT_JOIN=185 KW_SYSTEM=185
KW_SUBSTRING=186 KW_SYMBOL=186
KW_SYSTEM=187 KW_SERIALIZE_FN=187
KW_SYMBOL=188 KW_TABLE=188
KW_SERIALIZE_FN=189 KW_TABLES=189
KW_TABLE=190 KW_TABLESAMPLE=190
KW_TABLES=191 KW_TERMINATED=191
KW_TABLESAMPLE=192 KW_THEN=192
KW_TERMINATED=193 KW_TO=193
KW_THEN=194 KW_TRUE=194
KW_TO=195 KW_TRY_CAST=195
KW_TRUE=196 KW_TRUNCATE=196
KW_TRY_CAST=197 KW_UNCACHED=197
KW_TRUNCATE=198 KW_UESCAPE=198
KW_UNCACHED=199 KW_UNBOUNDED=199
KW_UESCAPE=200 KW_UNION=200
KW_UNBOUNDED=201 KW_UNNEST=201
KW_UNION=202 KW_UNSET=202
KW_UNNEST=203 KW_USE=203
KW_UNSET=204 KW_USER=204
KW_USE=205 KW_USING=205
KW_USER=206 KW_UPDATE_FN=206
KW_USING=207 KW_UPSERT=207
KW_UPDATE_FN=208 KW_UNKNOWN=208
KW_UPSERT=209 KW_URI=209
KW_UNKNOWN=210 KW_VALUE=210
KW_URI=211 KW_VALUES=211
KW_VALUE=212 KW_VIEW=212
KW_VALUES=213 KW_VIEWS=213
KW_VIEW=214 KW_WHEN=214
KW_VIEWS=215 KW_WHERE=215
KW_WHEN=216 KW_WITH=216
KW_WHERE=217 KW_YEAR=217
KW_WITH=218 KW_YEARS=218
KW_YEAR=219 KW_TEXTFILE=219
KW_YEARS=220 KW_ORC=220
KW_TEXTFILE=221 KW_AVRO=221
KW_ORC=222 KW_SEQUENCEFILE=222
KW_AVRO=223 KW_RCFILE=223
KW_SEQUENCEFILE=224 KW_REFERENCES=224
KW_RCFILE=225 KW_NOVALIDATE=225
KW_REFERENCES=226 KW_RELY=226
KW_NOVALIDATE=227 KW_BINARY=227
KW_RELY=228 KW_BIGINT=228
STATS_NUMDVS=229 KW_BOOLEAN=229
STATS_NUMNULLS=230 KW_CHAR=230
STATS_AVGSIZE=231 KW_DATE=231
STATS_MAXSIZE=232 KW_DECIMAL=232
EQ=233 KW_DOUBLE=233
NEQ=234 KW_INT=234
LT=235 KW_MAP=235
LTE=236 KW_REAL=236
GT=237 KW_SMALLINT=237
GTE=238 KW_FLOAT=238
PLUS=239 KW_STRING=239
MINUS=240 KW_STRUCT=240
ASTERISK=241 KW_TIMESTAMP=241
SLASH=242 KW_TINYINT=242
PERCENT=243 KW_VARCHAR=243
CONCAT=244 KW_COMPLEX=244
DOT=245 STATS_NUMDVS=245
SEMICOLON=246 STATS_NUMNULLS=246
COMMA=247 STATS_AVGSIZE=247
COLON=248 STATS_MAXSIZE=248
LPAREN=249 EQ=249
RPAREN=250 NEQ=250
LSQUARE=251 LT=251
RSQUARE=252 LTE=252
LCURLY=253 GT=253
RCURLY=254 GTE=254
BITWISEOR=255 PLUS=255
QUESTION=256 MINUS=256
RIGHT_ARROW=257 ASTERISK=257
STRING=258 SLASH=258
UNICODE_STRING=259 PERCENT=259
BINARY_LITERAL=260 CONCAT=260
INTEGER_VALUE=261 DOT=261
DECIMAL_VALUE=262 SEMICOLON=262
DOUBLE_VALUE=263 COMMA=263
IDENTIFIER=264 COLON=264
DIGIT_IDENTIFIER=265 LPAREN=265
QUOTED_IDENTIFIER=266 RPAREN=266
BACKQUOTED_IDENTIFIER=267 LSQUARE=267
TIME_WITH_TIME_ZONE=268 RSQUARE=268
TIMESTAMP_WITH_TIME_ZONE=269 LCURLY=269
DOUBLE_PRECISION=270 RCURLY=270
SIMPLE_COMMENT=271 BITWISEOR=271
BRACKETED_COMMENT=272 QUESTION=272
WS=273 RIGHT_ARROW=273
STRING=274
UNICODE_STRING=275
BINARY_LITERAL=276
INTEGER_VALUE=277
DECIMAL_VALUE=278
DOUBLE_VALUE=279
IDENTIFIER=280
DIGIT_IDENTIFIER=281
QUOTED_IDENTIFIER=282
BACKQUOTED_IDENTIFIER=283
TIME_WITH_TIME_ZONE=284
TIMESTAMP_WITH_TIME_ZONE=285
DOUBLE_PRECISION=286
SIMPLE_COMMENT=287
BRACKETED_COMMENT=288
WS=289
'ADD'=1 'ADD'=1
'ALL'=2 'ALL'=2
'ANALYTIC'=3 'ANALYTIC'=3
@ -392,138 +408,154 @@ WS=273
'LOCALTIME'=119 'LOCALTIME'=119
'LOCALTIMESTAMP'=120 'LOCALTIMESTAMP'=120
'METADATA'=121 'METADATA'=121
'MAP'=122 'MINUTE'=122
'MINUTE'=123 'MINUTES'=123
'MINUTES'=124 'MONTH'=124
'MONTH'=125 'MONTHS'=125
'MONTHS'=126 'MERGE_FN'=126
'MERGE_FN'=127 'NFC'=127
'NFC'=128 'NFD'=128
'NFD'=129 'NFKC'=129
'NFKC'=130 'NFKD'=130
'NFKD'=131 'NORMALIZE'=131
'NORMALIZE'=132 'NOT'=132
'NOT'=133 'NULL'=133
'NULL'=134 'NULLS'=134
'NULLS'=135 'OFFSET'=135
'OFFSET'=136 'ON'=136
'ON'=137 'OPTION'=137
'OPTION'=138 'OR'=138
'OR'=139 'ORDER'=139
'ORDER'=140 'ORDINALITY'=140
'ORDINALITY'=141 'OUTER'=141
'OUTER'=142 'OWNER'=142
'OWNER'=143 'OVER'=143
'OVER'=144 'OVERWRITE'=144
'OVERWRITE'=145 'PARTITION'=145
'PARTITION'=146 'PARTITIONS'=146
'PARTITIONS'=147 'PARQUET'=147
'PARQUET'=148 'POSITION'=148
'POSITION'=149 'PRECEDING'=149
'PRECEDING'=150 'PRIMARY'=150
'PRIMARY'=151 'REPLICATION'=151
'REPLICATION'=152 'PRIVILEGES'=152
'PRIVILEGES'=153 'PROPERTIES'=153
'PROPERTIES'=154 'RANGE'=154
'RANGE'=155 'RECOVER'=155
'RECOVER'=156 'RENAME'=156
'RENAME'=157 'REPEATABLE'=157
'REPEATABLE'=158 'REPLACE'=158
'REPLACE'=159 'RESTRICT'=159
'RESTRICT'=160 'RETURNS'=160
'RETURNS'=161 'REVOKE'=161
'REVOKE'=162 'REFRESH'=162
'REFRESH'=163 'REGEXP'=163
'REGEXP'=164 'RLIKE'=164
'RLIKE'=165 'RIGHT'=165
'RIGHT'=166 'ROLE'=166
'ROLE'=167 'ROLES'=167
'ROLES'=168 'ROW'=168
'ROW'=169 'ROWS'=169
'ROWS'=170 'SCHEMA'=170
'SCHEMA'=171 'SCHEMAS'=171
'SCHEMAS'=172 'SECOND'=172
'SECOND'=173 'SECONDS'=173
'SECONDS'=174 'SELECT'=174
'SELECT'=175 'SERDEPROPERTIES'=175
'SERDEPROPERTIES'=176 'SET'=176
'SET'=177 'SEMI'=177
'SEMI'=178 'SERVER'=178
'SERVER'=179 'SHOW'=179
'SHOW'=180 'SHUTDOWN'=180
'SHUTDOWN'=181 'SOME'=181
'SOME'=182 'STATS'=182
'STATS'=183 'STRAIGHT_JOIN'=183
'STRUCT'=184 'SUBSTRING'=184
'STRAIGHT_JOIN'=185 'SYSTEM'=185
'SUBSTRING'=186 'SYMBOL'=186
'SYSTEM'=187 'SERIALIZE_FN'=187
'SYMBOL'=188 'TABLE'=188
'SERIALIZE_FN'=189 'TABLES'=189
'TABLE'=190 'TABLESAMPLE'=190
'TABLES'=191 'TERMINATED '=191
'TABLESAMPLE'=192 'THEN'=192
'TERMINATED '=193 'TO'=193
'THEN'=194 'TRUE'=194
'TO'=195 'TRY_CAST'=195
'TRUE'=196 'TRUNCATE'=196
'TRY_CAST'=197 'UNCACHED'=197
'TRUNCATE'=198 'UESCAPE'=198
'UNCACHED'=199 'UNBOUNDED'=199
'UESCAPE'=200 'UNION'=200
'UNBOUNDED'=201 'UNNEST'=201
'UNION'=202 'UNSET'=202
'UNNEST'=203 'USE'=203
'UNSET'=204 'USER'=204
'USE'=205 'USING'=205
'USER'=206 'UPDATE_FN'=206
'USING'=207 'UPSERT'=207
'UPDATE_FN'=208 'UNKNOWN'=208
'UPSERT'=209 'URI'=209
'UNKNOWN'=210 'VALUE'=210
'URI'=211 'VALUES'=211
'VALUE'=212 'VIEW'=212
'VALUES'=213 'VIEWS'=213
'VIEW'=214 'WHEN'=214
'VIEWS'=215 'WHERE'=215
'WHEN'=216 'WITH'=216
'WHERE'=217 'YEAR'=217
'WITH'=218 'YEARS'=218
'YEAR'=219 'TEXTFILE'=219
'YEARS'=220 'ORC'=220
'TEXTFILE'=221 'AVRO'=221
'ORC'=222 'SEQUENCEFILE'=222
'AVRO'=223 'RCFILE'=223
'SEQUENCEFILE'=224 'REFERENCES'=224
'RCFILE'=225 'NOVALIDATE'=225
'REFERENCES'=226 'RELY'=226
'NOVALIDATE'=227 'BINARY'=227
'RELY'=228 'BIGINT'=228
'\'NUMDVS\''=229 'BOOLEAN'=229
'\'NUMNULLS\''=230 'CHAR'=230
'\'AVGSIZE\''=231 'DATE'=231
'\'MAXSIZE\''=232 'DECIMAL'=232
'='=233 'DOUBLE'=233
'<'=235 'INT'=234
'<='=236 'MAP'=235
'>'=237 'REAL'=236
'>='=238 'SMALLINT'=237
'+'=239 'FLOAT'=238
'-'=240 'STRING'=239
'*'=241 'STRUCT'=240
'/'=242 'TIMESTAMP'=241
'%'=243 'TINYINT'=242
'||'=244 'VARCHAR'=243
'.'=245 'COMPLEX'=244
';'=246 '\'NUMDVS\''=245
','=247 '\'NUMNULLS\''=246
':'=248 '\'AVGSIZE\''=247
'('=249 '\'MAXSIZE\''=248
')'=250 '='=249
'['=251 '<'=251
']'=252 '<='=252
'{'=253 '>'=253
'}'=254 '>='=254
'|'=255 '+'=255
'?'=256 '-'=256
'->'=257 '*'=257
'/'=258
'%'=259
'||'=260
'.'=261
';'=262
','=263
':'=264
'('=265
')'=266
'['=267
']'=268
'{'=269
'}'=270
'|'=271
'?'=272
'->'=273

2277
src/lib/impala/ImpalaSqlLexer.ts
View File

File diff suppressed because it is too large Load Diff

43
src/lib/impala/ImpalaSqlParser.interp
View File

File diff suppressed because one or more lines are too long

606
src/lib/impala/ImpalaSqlParser.tokens
View File

@ -119,158 +119,174 @@ KW_LOAD=118
KW_LOCALTIME=119 KW_LOCALTIME=119
KW_LOCALTIMESTAMP=120 KW_LOCALTIMESTAMP=120
KW_METADATA=121 KW_METADATA=121
KW_MAP=122 KW_MINUTE=122
KW_MINUTE=123 KW_MINUTES=123
KW_MINUTES=124 KW_MONTH=124
KW_MONTH=125 KW_MONTHS=125
KW_MONTHS=126 KW_MERGE_FN=126
KW_MERGE_FN=127 KW_NFC=127
KW_NFC=128 KW_NFD=128
KW_NFD=129 KW_NFKC=129
KW_NFKC=130 KW_NFKD=130
KW_NFKD=131 KW_NORMALIZE=131
KW_NORMALIZE=132 KW_NOT=132
KW_NOT=133 KW_NULL=133
KW_NULL=134 KW_NULLS=134
KW_NULLS=135 KW_OFFSET=135
KW_OFFSET=136 KW_ON=136
KW_ON=137 KW_OPTION=137
KW_OPTION=138 KW_OR=138
KW_OR=139 KW_ORDER=139
KW_ORDER=140 KW_ORDINALITY=140
KW_ORDINALITY=141 KW_OUTER=141
KW_OUTER=142 KW_OWNER=142
KW_OWNER=143 KW_OVER=143
KW_OVER=144 KW_OVERWRITE=144
KW_OVERWRITE=145 KW_PARTITION=145
KW_PARTITION=146 KW_PARTITIONS=146
KW_PARTITIONS=147 KW_PARQUET=147
KW_PARQUET=148 KW_POSITION=148
KW_POSITION=149 KW_PRECEDING=149
KW_PRECEDING=150 KW_PRIMARY=150
KW_PRIMARY=151 KW_REPLICATION=151
KW_REPLICATION=152 KW_PRIVILEGES=152
KW_PRIVILEGES=153 KW_PROPERTIES=153
KW_PROPERTIES=154 KW_RANGE=154
KW_RANGE=155 KW_RECOVER=155
KW_RECOVER=156 KW_RENAME=156
KW_RENAME=157 KW_REPEATABLE=157
KW_REPEATABLE=158 KW_REPLACE=158
KW_REPLACE=159 KW_RESTRICT=159
KW_RESTRICT=160 KW_RETURNS=160
KW_RETURNS=161 KW_REVOKE=161
KW_REVOKE=162 KW_REFRESH=162
KW_REFRESH=163 KW_REGEXP=163
KW_REGEXP=164 KW_RLIKE=164
KW_RLIKE=165 KW_RIGHT=165
KW_RIGHT=166 KW_ROLE=166
KW_ROLE=167 KW_ROLES=167
KW_ROLES=168 KW_ROW=168
KW_ROW=169 KW_ROWS=169
KW_ROWS=170 KW_SCHEMA=170
KW_SCHEMA=171 KW_SCHEMAS=171
KW_SCHEMAS=172 KW_SECOND=172
KW_SECOND=173 KW_SECONDS=173
KW_SECONDS=174 KW_SELECT=174
KW_SELECT=175 KW_SERDEPROPERTIES=175
KW_SERDEPROPERTIES=176 KW_SET=176
KW_SET=177 KW_SEMI=177
KW_SEMI=178 KW_SERVER=178
KW_SERVER=179 KW_SHOW=179
KW_SHOW=180 KW_SHUTDOWN=180
KW_SHUTDOWN=181 KW_SOME=181
KW_SOME=182 KW_STATS=182
KW_STATS=183 KW_STRAIGHT_JOIN=183
KW_STRUCT=184 KW_SUBSTRING=184
KW_STRAIGHT_JOIN=185 KW_SYSTEM=185
KW_SUBSTRING=186 KW_SYMBOL=186
KW_SYSTEM=187 KW_SERIALIZE_FN=187
KW_SYMBOL=188 KW_TABLE=188
KW_SERIALIZE_FN=189 KW_TABLES=189
KW_TABLE=190 KW_TABLESAMPLE=190
KW_TABLES=191 KW_TERMINATED=191
KW_TABLESAMPLE=192 KW_THEN=192
KW_TERMINATED=193 KW_TO=193
KW_THEN=194 KW_TRUE=194
KW_TO=195 KW_TRY_CAST=195
KW_TRUE=196 KW_TRUNCATE=196
KW_TRY_CAST=197 KW_UNCACHED=197
KW_TRUNCATE=198 KW_UESCAPE=198
KW_UNCACHED=199 KW_UNBOUNDED=199
KW_UESCAPE=200 KW_UNION=200
KW_UNBOUNDED=201 KW_UNNEST=201
KW_UNION=202 KW_UNSET=202
KW_UNNEST=203 KW_USE=203
KW_UNSET=204 KW_USER=204
KW_USE=205 KW_USING=205
KW_USER=206 KW_UPDATE_FN=206
KW_USING=207 KW_UPSERT=207
KW_UPDATE_FN=208 KW_UNKNOWN=208
KW_UPSERT=209 KW_URI=209
KW_UNKNOWN=210 KW_VALUE=210
KW_URI=211 KW_VALUES=211
KW_VALUE=212 KW_VIEW=212
KW_VALUES=213 KW_VIEWS=213
KW_VIEW=214 KW_WHEN=214
KW_VIEWS=215 KW_WHERE=215
KW_WHEN=216 KW_WITH=216
KW_WHERE=217 KW_YEAR=217
KW_WITH=218 KW_YEARS=218
KW_YEAR=219 KW_TEXTFILE=219
KW_YEARS=220 KW_ORC=220
KW_TEXTFILE=221 KW_AVRO=221
KW_ORC=222 KW_SEQUENCEFILE=222
KW_AVRO=223 KW_RCFILE=223
KW_SEQUENCEFILE=224 KW_REFERENCES=224
KW_RCFILE=225 KW_NOVALIDATE=225
KW_REFERENCES=226 KW_RELY=226
KW_NOVALIDATE=227 KW_BINARY=227
KW_RELY=228 KW_BIGINT=228
STATS_NUMDVS=229 KW_BOOLEAN=229
STATS_NUMNULLS=230 KW_CHAR=230
STATS_AVGSIZE=231 KW_DATE=231
STATS_MAXSIZE=232 KW_DECIMAL=232
EQ=233 KW_DOUBLE=233
NEQ=234 KW_INT=234
LT=235 KW_MAP=235
LTE=236 KW_REAL=236
GT=237 KW_SMALLINT=237
GTE=238 KW_FLOAT=238
PLUS=239 KW_STRING=239
MINUS=240 KW_STRUCT=240
ASTERISK=241 KW_TIMESTAMP=241
SLASH=242 KW_TINYINT=242
PERCENT=243 KW_VARCHAR=243
CONCAT=244 KW_COMPLEX=244
DOT=245 STATS_NUMDVS=245
SEMICOLON=246 STATS_NUMNULLS=246
COMMA=247 STATS_AVGSIZE=247
COLON=248 STATS_MAXSIZE=248
LPAREN=249 EQ=249
RPAREN=250 NEQ=250
LSQUARE=251 LT=251
RSQUARE=252 LTE=252
LCURLY=253 GT=253
RCURLY=254 GTE=254
BITWISEOR=255 PLUS=255
QUESTION=256 MINUS=256
RIGHT_ARROW=257 ASTERISK=257
STRING=258 SLASH=258
UNICODE_STRING=259 PERCENT=259
BINARY_LITERAL=260 CONCAT=260
INTEGER_VALUE=261 DOT=261
DECIMAL_VALUE=262 SEMICOLON=262
DOUBLE_VALUE=263 COMMA=263
IDENTIFIER=264 COLON=264
DIGIT_IDENTIFIER=265 LPAREN=265
QUOTED_IDENTIFIER=266 RPAREN=266
BACKQUOTED_IDENTIFIER=267 LSQUARE=267
TIME_WITH_TIME_ZONE=268 RSQUARE=268
TIMESTAMP_WITH_TIME_ZONE=269 LCURLY=269
DOUBLE_PRECISION=270 RCURLY=270
SIMPLE_COMMENT=271 BITWISEOR=271
BRACKETED_COMMENT=272 QUESTION=272
WS=273 RIGHT_ARROW=273
STRING=274
UNICODE_STRING=275
BINARY_LITERAL=276
INTEGER_VALUE=277
DECIMAL_VALUE=278
DOUBLE_VALUE=279
IDENTIFIER=280
DIGIT_IDENTIFIER=281
QUOTED_IDENTIFIER=282
BACKQUOTED_IDENTIFIER=283
TIME_WITH_TIME_ZONE=284
TIMESTAMP_WITH_TIME_ZONE=285
DOUBLE_PRECISION=286
SIMPLE_COMMENT=287
BRACKETED_COMMENT=288
WS=289
'ADD'=1 'ADD'=1
'ALL'=2 'ALL'=2
'ANALYTIC'=3 'ANALYTIC'=3
@ -392,138 +408,154 @@ WS=273
'LOCALTIME'=119 'LOCALTIME'=119
'LOCALTIMESTAMP'=120 'LOCALTIMESTAMP'=120
'METADATA'=121 'METADATA'=121
'MAP'=122 'MINUTE'=122
'MINUTE'=123 'MINUTES'=123
'MINUTES'=124 'MONTH'=124
'MONTH'=125 'MONTHS'=125
'MONTHS'=126 'MERGE_FN'=126
'MERGE_FN'=127 'NFC'=127
'NFC'=128 'NFD'=128
'NFD'=129 'NFKC'=129
'NFKC'=130 'NFKD'=130
'NFKD'=131 'NORMALIZE'=131
'NORMALIZE'=132 'NOT'=132
'NOT'=133 'NULL'=133
'NULL'=134 'NULLS'=134
'NULLS'=135 'OFFSET'=135
'OFFSET'=136 'ON'=136
'ON'=137 'OPTION'=137
'OPTION'=138 'OR'=138
'OR'=139 'ORDER'=139
'ORDER'=140 'ORDINALITY'=140
'ORDINALITY'=141 'OUTER'=141
'OUTER'=142 'OWNER'=142
'OWNER'=143 'OVER'=143
'OVER'=144 'OVERWRITE'=144
'OVERWRITE'=145 'PARTITION'=145
'PARTITION'=146 'PARTITIONS'=146
'PARTITIONS'=147 'PARQUET'=147
'PARQUET'=148 'POSITION'=148
'POSITION'=149 'PRECEDING'=149
'PRECEDING'=150 'PRIMARY'=150
'PRIMARY'=151 'REPLICATION'=151
'REPLICATION'=152 'PRIVILEGES'=152
'PRIVILEGES'=153 'PROPERTIES'=153
'PROPERTIES'=154 'RANGE'=154
'RANGE'=155 'RECOVER'=155
'RECOVER'=156 'RENAME'=156
'RENAME'=157 'REPEATABLE'=157
'REPEATABLE'=158 'REPLACE'=158
'REPLACE'=159 'RESTRICT'=159
'RESTRICT'=160 'RETURNS'=160
'RETURNS'=161 'REVOKE'=161
'REVOKE'=162 'REFRESH'=162
'REFRESH'=163 'REGEXP'=163
'REGEXP'=164 'RLIKE'=164
'RLIKE'=165 'RIGHT'=165
'RIGHT'=166 'ROLE'=166
'ROLE'=167 'ROLES'=167
'ROLES'=168 'ROW'=168
'ROW'=169 'ROWS'=169
'ROWS'=170 'SCHEMA'=170
'SCHEMA'=171 'SCHEMAS'=171
'SCHEMAS'=172 'SECOND'=172
'SECOND'=173 'SECONDS'=173
'SECONDS'=174 'SELECT'=174
'SELECT'=175 'SERDEPROPERTIES'=175
'SERDEPROPERTIES'=176 'SET'=176
'SET'=177 'SEMI'=177
'SEMI'=178 'SERVER'=178
'SERVER'=179 'SHOW'=179
'SHOW'=180 'SHUTDOWN'=180
'SHUTDOWN'=181 'SOME'=181
'SOME'=182 'STATS'=182
'STATS'=183 'STRAIGHT_JOIN'=183
'STRUCT'=184 'SUBSTRING'=184
'STRAIGHT_JOIN'=185 'SYSTEM'=185
'SUBSTRING'=186 'SYMBOL'=186
'SYSTEM'=187 'SERIALIZE_FN'=187
'SYMBOL'=188 'TABLE'=188
'SERIALIZE_FN'=189 'TABLES'=189
'TABLE'=190 'TABLESAMPLE'=190
'TABLES'=191 'TERMINATED '=191
'TABLESAMPLE'=192 'THEN'=192
'TERMINATED '=193 'TO'=193
'THEN'=194 'TRUE'=194
'TO'=195 'TRY_CAST'=195
'TRUE'=196 'TRUNCATE'=196
'TRY_CAST'=197 'UNCACHED'=197
'TRUNCATE'=198 'UESCAPE'=198
'UNCACHED'=199 'UNBOUNDED'=199
'UESCAPE'=200 'UNION'=200
'UNBOUNDED'=201 'UNNEST'=201
'UNION'=202 'UNSET'=202
'UNNEST'=203 'USE'=203
'UNSET'=204 'USER'=204
'USE'=205 'USING'=205
'USER'=206 'UPDATE_FN'=206
'USING'=207 'UPSERT'=207
'UPDATE_FN'=208 'UNKNOWN'=208
'UPSERT'=209 'URI'=209
'UNKNOWN'=210 'VALUE'=210
'URI'=211 'VALUES'=211
'VALUE'=212 'VIEW'=212
'VALUES'=213 'VIEWS'=213
'VIEW'=214 'WHEN'=214
'VIEWS'=215 'WHERE'=215
'WHEN'=216 'WITH'=216
'WHERE'=217 'YEAR'=217
'WITH'=218 'YEARS'=218
'YEAR'=219 'TEXTFILE'=219
'YEARS'=220 'ORC'=220
'TEXTFILE'=221 'AVRO'=221
'ORC'=222 'SEQUENCEFILE'=222
'AVRO'=223 'RCFILE'=223
'SEQUENCEFILE'=224 'REFERENCES'=224
'RCFILE'=225 'NOVALIDATE'=225
'REFERENCES'=226 'RELY'=226
'NOVALIDATE'=227 'BINARY'=227
'RELY'=228 'BIGINT'=228
'\'NUMDVS\''=229 'BOOLEAN'=229
'\'NUMNULLS\''=230 'CHAR'=230
'\'AVGSIZE\''=231 'DATE'=231
'\'MAXSIZE\''=232 'DECIMAL'=232
'='=233 'DOUBLE'=233
'<'=235 'INT'=234
'<='=236 'MAP'=235
'>'=237 'REAL'=236
'>='=238 'SMALLINT'=237
'+'=239 'FLOAT'=238
'-'=240 'STRING'=239
'*'=241 'STRUCT'=240
'/'=242 'TIMESTAMP'=241
'%'=243 'TINYINT'=242
'||'=244 'VARCHAR'=243
'.'=245 'COMPLEX'=244
';'=246 '\'NUMDVS\''=245
','=247 '\'NUMNULLS\''=246
':'=248 '\'AVGSIZE\''=247
'('=249 '\'MAXSIZE\''=248
')'=250 '='=249
'['=251 '<'=251
']'=252 '<='=252
'{'=253 '>'=253
'}'=254 '>='=254
'|'=255 '+'=255
'?'=256 '-'=256
'->'=257 '*'=257
'/'=258
'%'=259
'||'=260
'.'=261
';'=262
','=263
':'=264
'('=265
')'=266
'['=267
']'=268
'{'=269
'}'=270
'|'=271
'?'=272
'->'=273

7546
src/lib/impala/ImpalaSqlParser.ts
View File

File diff suppressed because it is too large Load Diff

11
src/lib/impala/ImpalaSqlParserListener.ts
View File

@ -221,6 +221,7 @@ import { IntervalContext } from "./ImpalaSqlParser.js";
import { IntervalFieldContext } from "./ImpalaSqlParser.js"; import { IntervalFieldContext } from "./ImpalaSqlParser.js";
import { NormalFormContext } from "./ImpalaSqlParser.js"; import { NormalFormContext } from "./ImpalaSqlParser.js";
import { TypeContext } from "./ImpalaSqlParser.js"; import { TypeContext } from "./ImpalaSqlParser.js";
import { DataTypeContext } from "./ImpalaSqlParser.js";
import { TypeParameterContext } from "./ImpalaSqlParser.js"; import { TypeParameterContext } from "./ImpalaSqlParser.js";
import { BaseTypeContext } from "./ImpalaSqlParser.js"; import { BaseTypeContext } from "./ImpalaSqlParser.js";
import { WhenClauseContext } from "./ImpalaSqlParser.js"; import { WhenClauseContext } from "./ImpalaSqlParser.js";
@ -2501,6 +2502,16 @@ export class ImpalaSqlParserListener implements ParseTreeListener {
* @param ctx the parse tree * @param ctx the parse tree
*/ */
exitType?: (ctx: TypeContext) => void; exitType?: (ctx: TypeContext) => void;
/**
* Enter a parse tree produced by `ImpalaSqlParser.dataType`.
* @param ctx the parse tree
*/
enterDataType?: (ctx: DataTypeContext) => void;
/**
* Exit a parse tree produced by `ImpalaSqlParser.dataType`.
* @param ctx the parse tree
*/
exitDataType?: (ctx: DataTypeContext) => void;
/** /**
* Enter a parse tree produced by `ImpalaSqlParser.typeParameter`. * Enter a parse tree produced by `ImpalaSqlParser.typeParameter`.
* @param ctx the parse tree * @param ctx the parse tree

7
src/lib/impala/ImpalaSqlParserVisitor.ts
View File

@ -221,6 +221,7 @@ import { IntervalContext } from "./ImpalaSqlParser.js";
import { IntervalFieldContext } from "./ImpalaSqlParser.js"; import { IntervalFieldContext } from "./ImpalaSqlParser.js";
import { NormalFormContext } from "./ImpalaSqlParser.js"; import { NormalFormContext } from "./ImpalaSqlParser.js";
import { TypeContext } from "./ImpalaSqlParser.js"; import { TypeContext } from "./ImpalaSqlParser.js";
import { DataTypeContext } from "./ImpalaSqlParser.js";
import { TypeParameterContext } from "./ImpalaSqlParser.js"; import { TypeParameterContext } from "./ImpalaSqlParser.js";
import { BaseTypeContext } from "./ImpalaSqlParser.js"; import { BaseTypeContext } from "./ImpalaSqlParser.js";
import { WhenClauseContext } from "./ImpalaSqlParser.js"; import { WhenClauseContext } from "./ImpalaSqlParser.js";
@ -1594,6 +1595,12 @@ export class ImpalaSqlParserVisitor<Result> extends AbstractParseTreeVisitor<Res
* @return the visitor result * @return the visitor result
*/ */
visitType?: (ctx: TypeContext) => Result; visitType?: (ctx: TypeContext) => Result;
/**
* Visit a parse tree produced by `ImpalaSqlParser.dataType`.
* @param ctx the parse tree
* @return the visitor result
*/
visitDataType?: (ctx: DataTypeContext) => Result;
/** /**
* Visit a parse tree produced by `ImpalaSqlParser.typeParameter`. * Visit a parse tree produced by `ImpalaSqlParser.typeParameter`.
* @param ctx the parse tree * @param ctx the parse tree

2
test/parser/impala/suggestion/fixtures/tokenSuggestion.sql
View File

@ -7,3 +7,5 @@ DROP ;
INSERT ; INSERT ;
SHOW ; SHOW ;
CREATE TABLE t1 (id );

34
test/parser/impala/suggestion/tokenSuggestion.test.ts
View File

@ -109,4 +109,38 @@ describe('Impala SQL Token Suggestion', () => {
'CURRENT', 'CURRENT',
]); ]);
}); });
test('Create table with column dataType', () => {
const pos: CaretPosition = {
lineNumber: 11,
column: 21,
};
const suggestion = impala.getSuggestionAtCaretPosition(
commentOtherLine(tokenSql, pos.lineNumber),
pos
)?.keywords;
const dataTypes = [
'INT',
'BINARY',
'BIGINT',
'BOOLEAN',
'CHAR',
'DATE',
'DECIMAL',
'DOUBLE',
'INT',
'MAP',
'REAL',
'SMALLINT',
'FLOAT',
'STRING',
'STRUCT',
'TIMESTAMP',
'TINYINT',
'VARCHAR',
'COMPLEX',
];
expect(dataTypes.every((dataType) => suggestion.includes(dataType))).toBe(true);
});
}); });

29
test/parser/impala/syntax/fixtures/create_table.sql
View File

@ -183,3 +183,32 @@ CREATE TABLE fk(id INT, col1 INT, col2 STRING, PRIMARY KEY(id),
CREATE TABLE new_Table like old_table; CREATE TABLE new_Table like old_table;
CREATE TABLE new_Table like old_table partitioned by (year int) SORT BY (last_name, state); CREATE TABLE new_Table like old_table partitioned by (year int) SORT BY (last_name, state);
CREATE TABLE IF NOT EXISTS t1 (id INT);
CREATE TABLE IF NOT EXISTS t1 (
id1 INT,
id2 BINARY,
id3 BIGINT,
id4 BOOLEAN,
id5 CHAR(4),
id6 DATE,
id7 DECIMAL(38, 0),
id8 DOUBLE,
id9 INT,
id10 MAP<INT, DOUBLE>,
id11 REAL,
id12 SMALLINT,
id13 FLOAT,
id14 STRING,
id15 STRUCT,
id16 TIMESTAMP,
id17 TINYINT,
id18 VARCHAR(256),
id19 COMPLEX,
id19 ARRAY<INT>
);
CREATE TABLE IF NOT EXISTS t1 (
id INT,
person STRUCT<first_name: STRING, last_name: VARCHAR(256)>
) PARTITIONED BY (student STRUCT<id: INT, name: VARCHAR(256), height: STRING, cost: DECIMAL(38, 0)>);