xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #5466 from taosdata/feature/query 

[td-225]remove unused keywords.
This commit is contained in:
haojun Liao 2021-03-17 16:28:16 +08:00 committed by GitHub
parent 4603735f7c 8286820a1c
commit 35f9dabb4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 811 additions and 825 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/inc/ttokendef.h
View File

@ -197,13 +197,11 @@
#define TK_PREV 178 #define TK_PREV 178
#define TK_LINEAR 179 #define TK_LINEAR 179
#define TK_IMPORT 180 #define TK_IMPORT 180
#define TK_METRIC 181 #define TK_TBNAME 181
#define TK_TBNAME 182 #define TK_JOIN 182
#define TK_JOIN 183 #define TK_INSERT 183
#define TK_METRICS 184 #define TK_INTO 184
#define TK_INSERT 185 #define TK_VALUES 185
#define TK_INTO 186
#define TK_VALUES 187
#define TK_SPACE 300 #define TK_SPACE 300

4
src/query/inc/sql.y
View File

@ -838,6 +838,4 @@ cmd ::= KILL QUERY INTEGER(X) COLON(Z) INTEGER(Y). {X.n += (Z.n + Y.n); s
%fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED %fallback ID ABORT AFTER ASC ATTACH BEFORE BEGIN CASCADE CLUSTER CONFLICT COPY DATABASE DEFERRED
DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD DELIMITERS DESC DETACH EACH END EXPLAIN FAIL FOR GLOB IGNORE IMMEDIATE INITIALLY INSTEAD
LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL LIKE MATCH KEY OF OFFSET RAISE REPLACE RESTRICT ROW STATEMENT TRIGGER VIEW ALL
NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT NOW IPTOKEN SEMI NONE PREV LINEAR IMPORT TBNAME JOIN STABLE NULL INSERT INTO VALUES.
METRIC TBNAME JOIN METRICS STABLE NULL INSERT INTO VALUES.

2
src/query/src/qTokenizer.c
View File

@ -206,10 +206,8 @@ static SKeyword keywordTable[] = {
{"PREV", TK_PREV}, {"PREV", TK_PREV},
{"LINEAR", TK_LINEAR}, {"LINEAR", TK_LINEAR},
{"IMPORT", TK_IMPORT}, {"IMPORT", TK_IMPORT},
{"METRIC", TK_METRIC},
{"TBNAME", TK_TBNAME}, {"TBNAME", TK_TBNAME},
{"JOIN", TK_JOIN}, {"JOIN", TK_JOIN},
{"METRICS", TK_METRICS},
{"STABLE", TK_STABLE}, {"STABLE", TK_STABLE},
{"FILE", TK_FILE}, {"FILE", TK_FILE},
{"VNODES", TK_VNODES}, {"VNODES", TK_VNODES},

1604
src/query/src/sql.c
View File

File diff suppressed because it is too large Load Diff

6
tests/script/general/parser/create_mt.sim
View File

@ -126,8 +126,7 @@ $tb_ = table
$tbs = tables $tbs = tables
$db_ = database $db_ = database
$dbs = databases $dbs = databases
$mt_ = metric $ses = session
$mts = metrics
$int = int $int = int
$bint = bigint $bint = bigint
$binary = binary $binary = binary
@ -145,8 +144,7 @@ sql_error create table $mt (ts timestamp, col1 int) tags ( $tb_ int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $tbs int) sql_error create table $mt (ts timestamp, col1 int) tags ( $tbs int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $db_ int) sql_error create table $mt (ts timestamp, col1 int) tags ( $db_ int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $dbs int) sql_error create table $mt (ts timestamp, col1 int) tags ( $dbs int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $mt_ int) sql_error create table $mt (ts timestamp, col1 int) tags ( $ses int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $mts int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $int int) sql_error create table $mt (ts timestamp, col1 int) tags ( $int int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $bint int) sql_error create table $mt (ts timestamp, col1 int) tags ( $bint int)
sql_error create table $mt (ts timestamp, col1 int) tags ( $binary int) sql_error create table $mt (ts timestamp, col1 int) tags ( $binary int)

6
tests/script/general/parser/create_tb.sim
View File

@ -90,8 +90,7 @@ $tb_ = table
$tbs = tables $tbs = tables
$db_ = database $db_ = database
$dbs = databases $dbs = databases
$mt_ = metric $ses = session
$mts = metrics
$int = int $int = int
$bint = bigint $bint = bigint
$binary = binary $binary = binary
@ -106,8 +105,7 @@ sql_error create table $tb (ts timestamp, $tb_ int)
sql_error create table $tb (ts timestamp, $tbs int) sql_error create table $tb (ts timestamp, $tbs int)
sql_error create table $tb (ts timestamp, $db_ int) sql_error create table $tb (ts timestamp, $db_ int)
sql_error create table $tb (ts timestamp, $dbs int) sql_error create table $tb (ts timestamp, $dbs int)
sql_error create table $tb (ts timestamp, $mt_ int) sql_error create table $tb (ts timestamp, $ses int)
sql_error create table $tb (ts timestamp, $mts int)
sql_error create table $tb (ts timestamp, $int int) sql_error create table $tb (ts timestamp, $int int)
sql_error create table $tb (ts timestamp, $bint int) sql_error create table $tb (ts timestamp, $bint int)
sql_error create table $tb (ts timestamp, $binary int) sql_error create table $tb (ts timestamp, $binary int)