Merge pull request #22048 from taosdata/feat/TD-25003

feat: add new syntax for show tags/index/table tags

docs/en/12-taos-sql/04-stable.md

@@ -51,6 +51,11 @@ DESCRIBE [db_name.]stb_name;
 
 ### View tag information for all child tables in the supertable
 
+```
+SHOW TABLE TAGS FROM table_name [FROM db_name];
+SHOW TABLE TAGS FROM [db_name.]table_name;
+```
+
 ```
 taos> SHOW TABLE TAGS FROM st1;
              tbname             |     id      |         loc          |

docs/en/12-taos-sql/24-show.md

@@ -101,6 +101,7 @@ Note: TDengine Enterprise Edition only.
 
 ```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
+SHOW INDEXES FROM [db_name.]tbl_name;
 ```
 
 Shows indices that have been created.
@@ -326,6 +327,7 @@ Note that only the information about the data blocks in the data file will be di
 
 ```sql
 SHOW TAGS FROM child_table_name [FROM db_name];
+SHOW TAGS FROM [db_name.]child_table_name;
 ```
 
 Shows all tag information in a subtable.

docs/en/12-taos-sql/27-index.md

@@ -43,6 +43,7 @@ DROP INDEX index_name;
 ````sql
 ```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
+SHOW INDEXES FROM [db_name.]tbl_name ;
 ````
 
 Shows indices that have been created for the specified database or table.

docs/zh/12-taos-sql/04-stable.md

@@ -51,6 +51,11 @@ DESCRIBE [db_name.]stb_name;
 
 ### 获取超级表中所有子表的标签信息
 
+```
+SHOW TABLE TAGS FROM table_name [FROM db_name];
+SHOW TABLE TAGS FROM [db_name.]table_name;
+```
+
 ```
 taos> SHOW TABLE TAGS FROM st1;
              tbname             |     id      |         loc          |

docs/zh/12-taos-sql/24-show.md

@@ -101,6 +101,7 @@ SHOW GRANTS;
 
 ```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
+SHOW INDEXES FROM [db_name.]tbl_name;
 ```
 
 显示已创建的索引。
@@ -269,6 +270,7 @@ Query OK, 24 row(s) in set (0.002444s)
 
 ```sql
 SHOW TAGS FROM child_table_name [FROM db_name];
+SHOW TAGS FROM [db_name.]child_table_name;
 ```
 
 显示子表的标签信息。

docs/zh/12-taos-sql/27-index.md

@@ -43,6 +43,7 @@ DROP INDEX index_name;
 ````sql
 ```sql
 SHOW INDEXES FROM tbl_name [FROM db_name];
+SHOW INDEXES FROM [db_name.]tbl_name;
 ````
 
 显示在所指定的数据库或表上已创建的索引。

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

@@ -447,6 +447,7 @@ cmd ::= SHOW MNODES.
 cmd ::= SHOW QNODES.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT); }
 cmd ::= SHOW FUNCTIONS.                                                           { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT); }
 cmd ::= SHOW INDEXES FROM table_name_cond(A) from_db_opt(B).                      { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, B, A, OP_TYPE_EQUAL); }
+cmd ::= SHOW INDEXES FROM db_name(B) NK_DOT table_name(A).                        { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, createIdentifierValueNode(pCxt, &B), createIdentifierValueNode(pCxt, &A), OP_TYPE_EQUAL); }
 cmd ::= SHOW STREAMS.                                                             { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT); }
 cmd ::= SHOW ACCOUNTS.                                                            { pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
 cmd ::= SHOW APPS.                                                                { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT); }
@@ -471,7 +472,9 @@ cmd ::= SHOW TABLE DISTRIBUTED full_table_name(A).
 cmd ::= SHOW CONSUMERS.                                                           { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONSUMERS_STMT); }
 cmd ::= SHOW SUBSCRIPTIONS.                                                       { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT); }
 cmd ::= SHOW TAGS FROM table_name_cond(A) from_db_opt(B).                         { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TAGS_STMT, B, A, OP_TYPE_EQUAL); }
+cmd ::= SHOW TAGS FROM db_name(B) NK_DOT table_name(A).                           { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TAGS_STMT, createIdentifierValueNode(pCxt, &B), createIdentifierValueNode(pCxt, &A), OP_TYPE_EQUAL); }
 cmd ::= SHOW TABLE TAGS tag_list_opt(C) FROM table_name_cond(A) from_db_opt(B).   { pCxt->pRootNode = createShowTableTagsStmt(pCxt, A, B, C); }
+cmd ::= SHOW TABLE TAGS tag_list_opt(C) FROM db_name(B) NK_DOT table_name(A).     { pCxt->pRootNode = createShowTableTagsStmt(pCxt, createIdentifierValueNode(pCxt, &A), createIdentifierValueNode(pCxt, &B), C); }
 cmd ::= SHOW VNODES NK_INTEGER(A).                                                { pCxt->pRootNode = createShowVnodesStmt(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &A), NULL); }
 cmd ::= SHOW VNODES NK_STRING(A).                                                 { pCxt->pRootNode = createShowVnodesStmt(pCxt, NULL, createValueNode(pCxt, TSDB_DATA_TYPE_VARCHAR, &A)); }
 // show alive

tests/parallel_test/cases.task

@@ -207,6 +207,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/precisionUS.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/precisionNS.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/show.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/show_tag_index.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/information_schema.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/abs.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/abs.py -R

tests/system-test/0-others/show_tag_index.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import re
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.common import *
+from util.sqlset import *
+
+class TDTestCase:
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def check_tags(self):
+        tdSql.checkRows(2)
+        tdSql.checkCols(6)
+        tdSql.checkData(0, 0, 'ctb1')
+        tdSql.checkData(0, 1, 'db')
+        tdSql.checkData(0, 2, 'stb')
+        tdSql.checkData(0, 3, 't0')
+        tdSql.checkData(0, 4, 'INT')
+        tdSql.checkData(0, 5, 1)
+        tdSql.checkData(1, 0, 'ctb1')
+        tdSql.checkData(1, 1, 'db')
+        tdSql.checkData(1, 2, 'stb')
+        tdSql.checkData(1, 3, 't1')
+        tdSql.checkData(1, 4, 'INT')
+        tdSql.checkData(1, 5, 1)
+
+    def check_table_tags(self, is_super_table):
+
+        if is_super_table == False:
+            tdSql.checkRows(1)
+            tdSql.checkCols(3)
+            tdSql.checkData(0, 0, 'ctb1')
+            tdSql.checkData(0, 1, 1)
+            tdSql.checkData(0, 2, 1)
+        else:
+            tdSql.checkRows(2)
+            tdSql.checkCols(3)
+            tdSql.checkData(0, 0, 'ctb1')
+            tdSql.checkData(1, 0, 'ctb2')
+            tdSql.checkData(0, 1, 1)
+            tdSql.checkData(1, 1, 2)
+            tdSql.checkData(0, 2, 1)
+            tdSql.checkData(1, 2, 2)
+
+    def check_indexes(self):
+        tdSql.checkRows(1)
+        tdSql.checkCols(7)
+        tdSql.checkData(0, 0, 'idx1')
+        tdSql.checkData(0, 1, 'db')
+        tdSql.checkData(0, 2, 'stb')
+        tdSql.checkData(0, 3, -1)
+        tdSql.checkData(0, 5, 't1')
+        tdSql.checkData(0, 6, 'tag_index')
+
+    def run(self):
+        tdSql.execute(f'create database db')
+        tdSql.execute(f'use db')
+        tdSql.execute(f'create table stb (ts timestamp, c0 int) tags (t0 int, t1 int)')
+        tdSql.execute(f'create table ctb1 using stb tags (1, 1)')
+        tdSql.execute(f'create table ctb2 using stb tags (2, 2)')
+        tdSql.execute(f'insert into ctb1 values (now, 1)')
+        tdSql.execute(f'insert into ctb2 values (now, 2)')
+
+        # show tags
+        tdSql.query(f'show tags from stb')
+        tdSql.checkRows(0)
+        tdSql.query(f'show tags from stb')
+        tdSql.checkRows(0);
+        tdSql.query(f'show tags from `stb`')
+        tdSql.checkRows(0);
+        tdSql.query(f'show tags from stb from db')
+        tdSql.checkRows(0);
+        tdSql.query(f'show tags from `stb` from `db`')
+        tdSql.checkRows(0);
+        tdSql.query(f'show tags from db.stb')
+        tdSql.checkRows(0);
+        tdSql.query(f'show tags from `db`.`stb`')
+        tdSql.checkRows(0);
+        tdSql.query(f'show tags from ctb1')
+        self.check_tags();
+        tdSql.query(f'show tags from `ctb1`')
+        self.check_tags();
+        tdSql.query(f'show tags from ctb1 from db')
+        self.check_tags();
+        tdSql.query(f'show tags from `ctb1` from `db`')
+        self.check_tags();
+        tdSql.query(f'show tags from db.ctb1')
+        self.check_tags();
+        tdSql.query(f'show tags from `db`.`ctb1`')
+        self.check_tags();
+
+        tdSql.error(f'show tags from db.stb from db')
+        tdSql.error(f'show tags from `db`.`stb` from db')
+        tdSql.error(f'show tags from db.ctb1 from db')
+        tdSql.error(f'show tags from `db`.`ctb1` from db')
+
+        # show table tags
+        tdSql.query(f'show table tags from stb')
+        self.check_table_tags(True);
+        tdSql.query(f'show table tags from `stb`')
+        self.check_table_tags(True);
+        tdSql.query(f'show table tags from stb from db')
+        self.check_table_tags(True);
+        tdSql.query(f'show table tags from `stb` from `db`')
+        self.check_table_tags(True);
+        tdSql.query(f'show table tags from db.stb')
+        self.check_table_tags(True);
+        tdSql.query(f'show table tags from `db`.`stb`')
+        self.check_table_tags(True);
+
+        tdSql.query(f'show table tags from ctb1')
+        self.check_table_tags(False);
+        tdSql.query(f'show table tags from `ctb1`')
+        self.check_table_tags(False);
+        tdSql.query(f'show table tags from ctb1 from db')
+        self.check_table_tags(False);
+        tdSql.query(f'show table tags from `ctb1` from `db`')
+        self.check_table_tags(False);
+        tdSql.query(f'show table tags from db.ctb1')
+        self.check_table_tags(False);
+        tdSql.query(f'show table tags from `db`.`ctb1`')
+        self.check_table_tags(False);
+
+        tdSql.error(f'show table tags from db.stb from db')
+        tdSql.error(f'show table tags from `db`.`stb` from db')
+        tdSql.error(f'show table tags from db.ctb1 from db')
+        tdSql.error(f'show table tags from `db`.`ctb1` from db')
+
+        # show indexes
+        tdSql.execute(f'create index idx1 on stb (t1)')
+
+        tdSql.query(f'show indexes from stb')
+        self.check_indexes();
+        tdSql.query(f'show indexes from `stb`')
+        self.check_indexes();
+        tdSql.query(f'show indexes from stb from db')
+        self.check_indexes();
+        tdSql.query(f'show indexes from `stb` from `db`')
+        self.check_indexes();
+        tdSql.query(f'show indexes from db.stb')
+        self.check_indexes();
+        tdSql.query(f'show indexes from `db`.`stb`')
+        self.check_indexes();
+
+        tdSql.query(f'show indexes from ctb1')
+        tdSql.checkRows(0)
+        tdSql.query(f'show indexes from `ctb1`')
+        tdSql.checkRows(0)
+        tdSql.query(f'show indexes from ctb1 from db')
+        tdSql.checkRows(0)
+        tdSql.query(f'show indexes from `ctb1` from `db`')
+        tdSql.checkRows(0)
+        tdSql.query(f'show indexes from db.ctb1')
+        tdSql.checkRows(0)
+        tdSql.query(f'show indexes from `db`.`ctb1`')
+        tdSql.checkRows(0)
+
+        tdSql.error(f'show indexes from db.stb from db')
+        tdSql.error(f'show indexes from `db`.`stb` from db')
+        tdSql.error(f'show indexes from db.ctb1 from db')
+        tdSql.error(f'show indexes from `db`.`ctb1` from db')
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())