fix:modify sql.y

include/common/ttokendef.h

@@ -16,105 +16,105 @@
 #ifndef _TD_COMMON_TOKEN_H_
 #define _TD_COMMON_TOKEN_H_
 
-#define TK_OR                               1
-#define TK_AND                              2
-#define TK_UNION                            3
-#define TK_ALL                              4
-#define TK_MINUS                            5
-#define TK_EXCEPT                           6
-#define TK_INTERSECT                        7
-#define TK_NK_BITAND                        8
-#define TK_NK_BITOR                         9
-#define TK_NK_LSHIFT                       10
-#define TK_NK_RSHIFT                       11
-#define TK_NK_PLUS                         12
-#define TK_NK_MINUS                        13
-#define TK_NK_STAR                         14
-#define TK_NK_SLASH                        15
-#define TK_NK_REM                          16
-#define TK_NK_CONCAT                       17
-#define TK_CREATE                          18
-#define TK_ACCOUNT                         19
-#define TK_NK_ID                           20
-#define TK_PASS                            21
-#define TK_NK_STRING                       22
-#define TK_ALTER                           23
-#define TK_PPS                             24
-#define TK_TSERIES                         25
-#define TK_STORAGE                         26
-#define TK_STREAMS                         27
-#define TK_QTIME                           28
-#define TK_DBS                             29
-#define TK_USERS                           30
-#define TK_CONNS                           31
-#define TK_STATE                           32
-#define TK_USER                            33
-#define TK_ENABLE                          34
-#define TK_NK_INTEGER                      35
-#define TK_SYSINFO                         36
-#define TK_DROP                            37
-#define TK_GRANT                           38
-#define TK_ON                              39
-#define TK_TO                              40
-#define TK_REVOKE                          41
-#define TK_FROM                            42
-#define TK_SUBSCRIBE                       43
-#define TK_NK_COMMA                        44
-#define TK_READ                            45
-#define TK_WRITE                           46
-#define TK_NK_DOT                          47
-#define TK_WITH                            48
-#define TK_DNODE                           49
-#define TK_PORT                            50
-#define TK_DNODES                          51
-#define TK_RESTORE                         52
-#define TK_NK_IPTOKEN                      53
-#define TK_FORCE                           54
-#define TK_UNSAFE                          55
-#define TK_LOCAL                           56
-#define TK_QNODE                           57
-#define TK_BNODE                           58
-#define TK_SNODE                           59
-#define TK_MNODE                           60
-#define TK_VNODE                           61
-#define TK_DATABASE                        62
-#define TK_USE                             63
-#define TK_FLUSH                           64
-#define TK_TRIM                            65
-#define TK_COMPACT                         66
-#define TK_IF                              67
-#define TK_NOT                             68
-#define TK_EXISTS                          69
-#define TK_BUFFER                          70
-#define TK_CACHEMODEL                      71
-#define TK_CACHESIZE                       72
-#define TK_COMP                            73
-#define TK_DURATION                        74
-#define TK_NK_VARIABLE                     75
-#define TK_MAXROWS                         76
-#define TK_MINROWS                         77
-#define TK_KEEP                            78
-#define TK_PAGES                           79
-#define TK_PAGESIZE                        80
-#define TK_TSDB_PAGESIZE                   81
-#define TK_PRECISION                       82
-#define TK_REPLICA                         83
-#define TK_VGROUPS                         84
-#define TK_SINGLE_STABLE                   85
-#define TK_RETENTIONS                      86
-#define TK_SCHEMALESS                      87
-#define TK_WAL_LEVEL                       88
-#define TK_WAL_FSYNC_PERIOD                89
-#define TK_WAL_RETENTION_PERIOD            90
-#define TK_WAL_RETENTION_SIZE              91
-#define TK_WAL_ROLL_PERIOD                 92
-#define TK_WAL_SEGMENT_SIZE                93
-#define TK_STT_TRIGGER                     94
-#define TK_TABLE_PREFIX                    95
-#define TK_TABLE_SUFFIX                    96
-#define TK_NK_COLON                        97
-#define TK_MAX_SPEED                       98
-#define TK_START                           99
+#define TK_OR                              1
+#define TK_AND                             2
+#define TK_UNION                           3
+#define TK_ALL                             4
+#define TK_MINUS                           5
+#define TK_EXCEPT                          6
+#define TK_INTERSECT                       7
+#define TK_NK_BITAND                       8
+#define TK_NK_BITOR                        9
+#define TK_NK_LSHIFT                      10
+#define TK_NK_RSHIFT                      11
+#define TK_NK_PLUS                        12
+#define TK_NK_MINUS                       13
+#define TK_NK_STAR                        14
+#define TK_NK_SLASH                       15
+#define TK_NK_REM                         16
+#define TK_NK_CONCAT                      17
+#define TK_CREATE                         18
+#define TK_ACCOUNT                        19
+#define TK_NK_ID                          20
+#define TK_PASS                           21
+#define TK_NK_STRING                      22
+#define TK_ALTER                          23
+#define TK_PPS                            24
+#define TK_TSERIES                        25
+#define TK_STORAGE                        26
+#define TK_STREAMS                        27
+#define TK_QTIME                          28
+#define TK_DBS                            29
+#define TK_USERS                          30
+#define TK_CONNS                          31
+#define TK_STATE                          32
+#define TK_USER                           33
+#define TK_ENABLE                         34
+#define TK_NK_INTEGER                     35
+#define TK_SYSINFO                        36
+#define TK_DROP                           37
+#define TK_GRANT                          38
+#define TK_ON                             39
+#define TK_TO                             40
+#define TK_REVOKE                         41
+#define TK_FROM                           42
+#define TK_SUBSCRIBE                      43
+#define TK_NK_COMMA                       44
+#define TK_READ                           45
+#define TK_WRITE                          46
+#define TK_NK_DOT                         47
+#define TK_WITH                           48
+#define TK_DNODE                          49
+#define TK_PORT                           50
+#define TK_DNODES                         51
+#define TK_RESTORE                        52
+#define TK_NK_IPTOKEN                     53
+#define TK_FORCE                          54
+#define TK_UNSAFE                         55
+#define TK_LOCAL                          56
+#define TK_QNODE                          57
+#define TK_BNODE                          58
+#define TK_SNODE                          59
+#define TK_MNODE                          60
+#define TK_VNODE                          61
+#define TK_DATABASE                       62
+#define TK_USE                            63
+#define TK_FLUSH                          64
+#define TK_TRIM                           65
+#define TK_COMPACT                        66
+#define TK_IF                             67
+#define TK_NOT                            68
+#define TK_EXISTS                         69
+#define TK_BUFFER                         70
+#define TK_CACHEMODEL                     71
+#define TK_CACHESIZE                      72
+#define TK_COMP                           73
+#define TK_DURATION                       74
+#define TK_NK_VARIABLE                    75
+#define TK_MAXROWS                        76
+#define TK_MINROWS                        77
+#define TK_KEEP                           78
+#define TK_PAGES                          79
+#define TK_PAGESIZE                       80
+#define TK_TSDB_PAGESIZE                  81
+#define TK_PRECISION                      82
+#define TK_REPLICA                        83
+#define TK_VGROUPS                        84
+#define TK_SINGLE_STABLE                  85
+#define TK_RETENTIONS                     86
+#define TK_SCHEMALESS                     87
+#define TK_WAL_LEVEL                      88
+#define TK_WAL_FSYNC_PERIOD               89
+#define TK_WAL_RETENTION_PERIOD           90
+#define TK_WAL_RETENTION_SIZE             91
+#define TK_WAL_ROLL_PERIOD                92
+#define TK_WAL_SEGMENT_SIZE               93
+#define TK_STT_TRIGGER                    94
+#define TK_TABLE_PREFIX                   95
+#define TK_TABLE_SUFFIX                   96
+#define TK_NK_COLON                       97
+#define TK_MAX_SPEED                      98
+#define TK_START                          99
 #define TK_TIMESTAMP                      100
 #define TK_END                            101
 #define TK_TABLE                          102

source/libs/parser/inc/sql.y

@@ -538,15 +538,18 @@ sma_stream_opt(A) ::= sma_stream_opt(B) MAX_DELAY duration_literal(C).
 sma_stream_opt(A) ::= sma_stream_opt(B) DELETE_MARK duration_literal(C).          { ((SStreamOptions*)B)->pDeleteMark = releaseRawExprNode(pCxt, C); A = B; }
 
 /************************************************ create/drop topic ***************************************************/
-with_meta(A) ::= .                                                                { A = 0; }
-with_meta(A) ::= WITH META.                                                       { A = 1; }
-with_meta(A) ::= ONLY META.                                                       { A = 2; }
-
 cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B) AS query_or_subquery(C).     { pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, A, &B, C); }
-cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B) with_meta(D)
-  AS DATABASE db_name(C).                                                         { pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, A, &B, &C, D); }
-cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B) with_meta(E)
-  AS STABLE full_table_name(C) where_clause_opt(D).                               { pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, A, &B, C, E, D); }
+cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B) AS DATABASE db_name(C).      { pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, A, &B, &C, 0); }
+cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B)
+  WITH META AS DATABASE db_name(C).                                               { pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, A, &B, &C, 1); }
+cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B)
+  ONLY META AS DATABASE db_name(C).                                               { pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, A, &B, &C, 2); }
+cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B)
+  AS STABLE full_table_name(C) where_clause_opt(D).                               { pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, A, &B, C, 0, D); }
+cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B)
+  WITH META AS STABLE full_table_name(C) where_clause_opt(D).                     { pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, A, &B, C, 1, D); }
+cmd ::= CREATE TOPIC not_exists_opt(A) topic_name(B)
+  ONLY META AS STABLE full_table_name(C) where_clause_opt(D).                     { pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, A, &B, C, 2, D); }
 cmd ::= DROP TOPIC exists_opt(A) topic_name(B).                                   { pCxt->pRootNode = createDropTopicStmt(pCxt, A, &B); }
 cmd ::= DROP CONSUMER GROUP exists_opt(A) cgroup_name(B) ON topic_name(C).        { pCxt->pRootNode = createDropCGroupStmt(pCxt, A, &B, &C); }