add syntax for show tags/index/table tags from db.tb

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
@@ -355,8 +355,6 @@
 #define TK_WAL                            337
 
 
-
-
 #define TK_NK_SPACE   600
 #define TK_NK_COMMENT 601
 #define TK_NK_ILLEGAL 602

source/libs/parser/inc/sql.y

@@ -485,6 +485,7 @@ like_pattern_opt(A) ::= .
 like_pattern_opt(A) ::= LIKE NK_STRING(B).                                        { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
 
 table_name_cond(A) ::= table_name(B).                                             { A = createIdentifierValueNode(pCxt, &B); }
+table_name_cond(A) ::= db_name(B) NK_DOT table_name(C).                           { A = createRealTableNode(pCxt, &B, &C, NULL); }
 
 from_db_opt(A) ::= .                                                              { A = createDefaultDatabaseCondValue(pCxt); }
 from_db_opt(A) ::= FROM db_name(B).                                               { A = createIdentifierValueNode(pCxt, &B); }