[td-2570] update the script and the corresponding tokenizer

src/inc/ttokendef.h

@@ -17,105 +17,105 @@
 #define TDENGINE_TTOKENDEF_H
 
 
-#define TK_ID                              1
-#define TK_BOOL                            2
-#define TK_TINYINT                         3
-#define TK_SMALLINT                        4
-#define TK_INTEGER                         5
-#define TK_BIGINT                          6
-#define TK_FLOAT                           7
-#define TK_DOUBLE                          8
-#define TK_STRING                          9
-#define TK_TIMESTAMP                      10
-#define TK_BINARY                         11
-#define TK_NCHAR                          12
-#define TK_OR                             13
-#define TK_AND                            14
-#define TK_NOT                            15
-#define TK_EQ                             16
-#define TK_NE                             17
-#define TK_ISNULL                         18
-#define TK_NOTNULL                        19
-#define TK_IS                             20
-#define TK_LIKE                           21
-#define TK_GLOB                           22
-#define TK_BETWEEN                        23
-#define TK_IN                             24
-#define TK_GT                             25
-#define TK_GE                             26
-#define TK_LT                             27
-#define TK_LE                             28
-#define TK_BITAND                         29
-#define TK_BITOR                          30
-#define TK_LSHIFT                         31
-#define TK_RSHIFT                         32
-#define TK_PLUS                           33
-#define TK_MINUS                          34
-#define TK_DIVIDE                         35
-#define TK_TIMES                          36
-#define TK_STAR                           37
-#define TK_SLASH                          38
-#define TK_REM                            39
-#define TK_CONCAT                         40
-#define TK_UMINUS                         41
-#define TK_UPLUS                          42
-#define TK_BITNOT                         43
-#define TK_SHOW                           44
-#define TK_DATABASES                      45
-#define TK_TOPICS                         46
-#define TK_MNODES                         47
-#define TK_DNODES                         48
-#define TK_ACCOUNTS                       49
-#define TK_USERS                          50
-#define TK_MODULES                        51
-#define TK_QUERIES                        52
-#define TK_CONNECTIONS                    53
-#define TK_STREAMS                        54
-#define TK_VARIABLES                      55
-#define TK_SCORES                         56
-#define TK_GRANTS                         57
-#define TK_VNODES                         58
-#define TK_IPTOKEN                        59
-#define TK_DOT                            60
-#define TK_CREATE                         61
-#define TK_TABLE                          62
-#define TK_STABLE                         63
-#define TK_DATABASE                       64
-#define TK_TABLES                         65
-#define TK_STABLES                        66
-#define TK_VGROUPS                        67
-#define TK_DROP                           68
-#define TK_TOPIC                          69
-#define TK_DNODE                          70
-#define TK_USER                           71
-#define TK_ACCOUNT                        72
-#define TK_USE                            73
-#define TK_DESCRIBE                       74
-#define TK_ALTER                          75
-#define TK_PASS                           76
-#define TK_PRIVILEGE                      77
-#define TK_LOCAL                          78
-#define TK_IF                             79
-#define TK_EXISTS                         80
-#define TK_PPS                            81
-#define TK_TSERIES                        82
-#define TK_DBS                            83
-#define TK_STORAGE                        84
-#define TK_QTIME                          85
-#define TK_CONNS                          86
-#define TK_STATE                          87
-#define TK_KEEP                           88
-#define TK_CACHE                          89
-#define TK_REPLICA                        90
-#define TK_QUORUM                         91
-#define TK_DAYS                           92
-#define TK_MINROWS                        93
-#define TK_MAXROWS                        94
-#define TK_BLOCKS                         95
-#define TK_CTIME                          96
-#define TK_WAL                            97
-#define TK_FSYNC                          98
-#define TK_COMP                           99
+#define TK_ID                               1
+#define TK_BOOL                             2
+#define TK_TINYINT                          3
+#define TK_SMALLINT                         4
+#define TK_INTEGER                          5
+#define TK_BIGINT                           6
+#define TK_FLOAT                            7
+#define TK_DOUBLE                           8
+#define TK_STRING                           9
+#define TK_TIMESTAMP                       10
+#define TK_BINARY                          11
+#define TK_NCHAR                           12
+#define TK_OR                              13
+#define TK_AND                             14
+#define TK_NOT                             15
+#define TK_EQ                              16
+#define TK_NE                              17
+#define TK_ISNULL                          18
+#define TK_NOTNULL                         19
+#define TK_IS                              20
+#define TK_LIKE                            21
+#define TK_GLOB                            22
+#define TK_BETWEEN                         23
+#define TK_IN                              24
+#define TK_GT                              25
+#define TK_GE                              26
+#define TK_LT                              27
+#define TK_LE                              28
+#define TK_BITAND                          29
+#define TK_BITOR                           30
+#define TK_LSHIFT                          31
+#define TK_RSHIFT                          32
+#define TK_PLUS                            33
+#define TK_MINUS                           34
+#define TK_DIVIDE                          35
+#define TK_TIMES                           36
+#define TK_STAR                            37
+#define TK_SLASH                           38
+#define TK_REM                             39
+#define TK_CONCAT                          40
+#define TK_UMINUS                          41
+#define TK_UPLUS                           42
+#define TK_BITNOT                          43
+#define TK_SHOW                            44
+#define TK_DATABASES                       45
+#define TK_TOPICS                          46
+#define TK_MNODES                          47
+#define TK_DNODES                          48
+#define TK_ACCOUNTS                        49
+#define TK_USERS                           50
+#define TK_MODULES                         51
+#define TK_QUERIES                         52
+#define TK_CONNECTIONS                     53
+#define TK_STREAMS                         54
+#define TK_VARIABLES                       55
+#define TK_SCORES                          56
+#define TK_GRANTS                          57
+#define TK_VNODES                          58
+#define TK_IPTOKEN                         59
+#define TK_DOT                             60
+#define TK_CREATE                          61
+#define TK_TABLE                           62
+#define TK_STABLE                          63
+#define TK_DATABASE                        64
+#define TK_TABLES                          65
+#define TK_STABLES                         66
+#define TK_VGROUPS                         67
+#define TK_DROP                            68
+#define TK_TOPIC                           69
+#define TK_DNODE                           70
+#define TK_USER                            71
+#define TK_ACCOUNT                         72
+#define TK_USE                             73
+#define TK_DESCRIBE                        74
+#define TK_ALTER                           75
+#define TK_PASS                            76
+#define TK_PRIVILEGE                       77
+#define TK_LOCAL                           78
+#define TK_IF                              79
+#define TK_EXISTS                          80
+#define TK_PPS                             81
+#define TK_TSERIES                         82
+#define TK_DBS                             83
+#define TK_STORAGE                         84
+#define TK_QTIME                           85
+#define TK_CONNS                           86
+#define TK_STATE                           87
+#define TK_KEEP                            88
+#define TK_CACHE                           89
+#define TK_REPLICA                         90
+#define TK_QUORUM                          91
+#define TK_DAYS                            92
+#define TK_MINROWS                         93
+#define TK_MAXROWS                         94
+#define TK_BLOCKS                          95
+#define TK_CTIME                           96
+#define TK_WAL                             97
+#define TK_FSYNC                           98
+#define TK_COMP                            99
 #define TK_PRECISION                      100
 #define TK_UPDATE                         101
 #define TK_CACHELAST                      102
@@ -136,7 +136,7 @@
 #define TK_VARIABLE                       117
 #define TK_INTERVAL                       118
 #define TK_SESSION                        119
-#define TK_WINDOW_STATE                   120
+#define TK_STATE_WINDOW                   120
 #define TK_FILL                           121
 #define TK_SLIDING                        122
 #define TK_ORDER                          123

src/query/inc/sql.y

@@ -554,7 +554,7 @@ session_option(X) ::= SESSION LP ids(V) cpxName(Z) COMMA tmvar(Y) RP.    {
 }
 %type windowstate_option {SWindowStateVal}
 windowstate_option(X) ::= .                                                  {X.col.n = 0;}
-windowstate_option(X) ::= WINDOW_STATE LP ids(V) RP.                       {
+windowstate_option(X) ::= STATE_WINDOW LP ids(V) RP.                       {
    X.col = V;
 }  
 

src/query/src/qTokenizer.c

@@ -141,7 +141,7 @@ static SKeyword keywordTable[] = {
     {"VARIABLE",     TK_VARIABLE},
     {"INTERVAL",     TK_INTERVAL},
     {"SESSION",      TK_SESSION},
-    {"WINDOW_STATE", TK_WINDOW_STATE},
+    {"STATE_WINDOW", TK_STATE_WINDOW},
     {"FILL",         TK_FILL},
     {"SLIDING",      TK_SLIDING},
     {"ORDER",        TK_ORDER},