Merge branch '3.0' into merge/mainto3.0

Author: guanshengliang

docs/en/14-reference/03-taos-sql/52-show.md

@@ -177,10 +177,10 @@ Displays information about all supertables in the current database. You can use
 ## SHOW STREAMS
 
 ```sql
-SHOW [db_name.]STREAMS;
+SHOW [db_name.]STREAMS [LIKE 'pattern'];
 ```
 
-Displays information about all stream computations in the current database.
+Displays information about stream computations. If db_name is not specified, it displays streams from all databases. You can use LIKE for fuzzy matching of stream names.
 
 ## SHOW SUBSCRIPTIONS
 

docs/zh/14-reference/03-taos-sql/52-show.md

@@ -189,10 +189,10 @@ SHOW [db_name.]STABLES [LIKE 'pattern'];
 ## SHOW STREAMS
 
 ```sql
-SHOW [db_name.]STREAMS;
+SHOW [db_name.]STREAMS [LIKE 'pattern'];
 ```
 
-显示当前数据库下的所有流计算的信息。
+显示流计算的信息。如果不指定数据库，则显示所有数据库下的流计算。可以使用 LIKE 对流名进行模糊匹配。
 
 ## SHOW SUBSCRIPTIONS
 

source/libs/parser/inc/parAst.h

@@ -546,7 +546,7 @@ SNode*     createShowTSMASStmt(SAstCreateContext* pCxt, SNode* dbName);
 SNode*     createShowDiskUsageStmt(SAstCreateContext* pCxt, SNode* dbName, ENodeType type);
 SNodeList* createColsFuncParamNodeList(SAstCreateContext* pCxt, SNode* pFuncNode, SNodeList* pNodeList, SToken* pAlias);
 
-SNode* createShowStreamsStmt(SAstCreateContext* pCxt, SNode* dbName, ENodeType type);
+SNode* createShowStreamsStmt(SAstCreateContext* pCxt, SNode* pDbName, SNode* pLike, ENodeType type);
 SNode* createScanStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart, SNode* pEnd);
 SNode* createScanVgroupsStmt(SAstCreateContext* pCxt, SNode* pDbName, SNodeList* vgidList, SNode* pStart, SNode* pEnd);
 SNode* createShowScansStmt(SAstCreateContext* pCxt, ENodeType type);

source/libs/parser/inc/sql.y

@@ -1322,7 +1322,7 @@ cmd ::= SHOW ARBGROUPS.
 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 db_name_cond_opt(A) STREAMS.                                         { pCxt->pRootNode = createShowStreamsStmt(pCxt, A, QUERY_NODE_SHOW_STREAMS_STMT); }
+cmd ::= SHOW db_name_cond_opt(A) STREAMS like_pattern_opt(B).                     { pCxt->pRootNode = createShowStreamsStmt(pCxt, A, B, 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); }
 cmd ::= SHOW CONNECTIONS.                                                         { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT); }

source/libs/parser/src/parAstCreater.c

@@ -8216,25 +8216,22 @@ SNode* createShowDiskUsageStmt(SAstCreateContext* pCxt, SNode* dbName, ENodeType
   return NULL;
 }
 
-SNode* createShowStreamsStmt(SAstCreateContext* pCxt, SNode* pDbName, ENodeType type) {
+SNode* createShowStreamsStmt(SAstCreateContext* pCxt, SNode* pDbName, SNode* pLike, ENodeType type) {
   CHECK_PARSER_STATUS(pCxt);
 
-  if (needDbShowStmt(type) && NULL == pDbName) {
-    snprintf(pCxt->pQueryCxt->pMsg, pCxt->pQueryCxt->msgLen, "database not specified");
-    pCxt->errCode = TSDB_CODE_PAR_SYNTAX_ERROR;
-    CHECK_PARSER_STATUS(pCxt);
-  }
-
   SShowStmt* pStmt = NULL;
   pCxt->errCode = nodesMakeNode(type, (SNode**)&pStmt);
   CHECK_MAKE_NODE(pStmt);
   pStmt->withFull = false;
   pStmt->pDbName = pDbName;
+  pStmt->pTbName = pLike;
+  pStmt->tableCondType = OP_TYPE_LIKE;
 
   return (SNode*)pStmt;
 
 _err:
   nodesDestroyNode(pDbName);
+  nodesDestroyNode(pLike);
   return NULL;
 }
 

source/libs/parser/src/parAstParser.c

@@ -1112,16 +1112,18 @@ static int32_t collectMetaKeyFromShowStables(SCollectMetaKeyCxt* pCxt, SShowStmt
 static int32_t collectMetaKeyFromShowStreams(SCollectMetaKeyCxt* pCxt, SShowStmt* pStmt) {
   int32_t code = reserveTableMetaInCache(pCxt->pParseCxt->acctId, TSDB_INFORMATION_SCHEMA_DB, TSDB_INS_TABLE_STREAMS,
                                          pCxt->pMetaCache);
-  if (TSDB_CODE_SUCCESS == code) {
-    code = reserveDbVgInfoInCache(pCxt->pParseCxt->acctId, ((SValueNode*)pStmt->pDbName)->literal, pCxt->pMetaCache);
-  }
-  if (TSDB_CODE_SUCCESS == code) {
-    code = reserveDbCfgInCache(pCxt->pParseCxt->acctId, ((SValueNode*)pStmt->pDbName)->literal, pCxt->pMetaCache);
-  }
-  if (TSDB_CODE_SUCCESS == code) {
-    code =
-        reserveUserAuthInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->pUser, ((SValueNode*)pStmt->pDbName)->literal,
-                               NULL, PRIV_DB_USE, PRIV_OBJ_DB, pCxt->pMetaCache);
+  if (TSDB_CODE_SUCCESS == code && pStmt->pDbName != NULL) {
+    if (TSDB_CODE_SUCCESS == code) {
+      code = reserveDbVgInfoInCache(pCxt->pParseCxt->acctId, ((SValueNode*)pStmt->pDbName)->literal, pCxt->pMetaCache);
+    }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = reserveDbCfgInCache(pCxt->pParseCxt->acctId, ((SValueNode*)pStmt->pDbName)->literal, pCxt->pMetaCache);
+    }
+    if (TSDB_CODE_SUCCESS == code) {
+      code = reserveUserAuthInCache(pCxt->pParseCxt->acctId, pCxt->pParseCxt->pUser,
+                                    ((SValueNode*)pStmt->pDbName)->literal, NULL, PRIV_DB_USE, PRIV_OBJ_DB,
+                                    pCxt->pMetaCache);
+    }
   }
   return code;
 }

source/libs/parser/src/parTranslater.c

@@ -82,7 +82,7 @@ typedef struct SSysTableShowAdapter {
   const char* pDbName;
   const char* pTableName;
   int32_t     numOfShowCols;
-  const char* pShowCols[3];
+  const char* pShowCols[4];
 } SSysTableShowAdapter;
 
 typedef struct SCollectJoinCondsContext {
@@ -193,8 +193,8 @@ static const SSysTableShowAdapter sysTableShowAdapter[] = {
     .showType = QUERY_NODE_SHOW_STREAMS_STMT,
     .pDbName = TSDB_INFORMATION_SCHEMA_DB,
     .pTableName = TSDB_INS_TABLE_STREAMS,
-    .numOfShowCols = 3,
-    .pShowCols = {"stream_name","status","message"}
+    .numOfShowCols = 4,
+    .pShowCols = {"stream_name","status","message","db_name"}
   },
   {
     .showType = QUERY_NODE_SHOW_TABLES_STMT,
@@ -22419,6 +22419,9 @@ static const char* getTbNameColName(ENodeType type) {
     case QUERY_NODE_SHOW_STABLES_STMT:
       colName = "stable_name";
       break;
+    case QUERY_NODE_SHOW_STREAMS_STMT:
+      colName = "stream_name";
+      break;
     case QUERY_NODE_SHOW_INSTANCES_STMT:
       colName = "id";
       break;
@@ -22760,7 +22763,7 @@ static int32_t rewriteShow(STranslateContext* pCxt, SQuery* pQuery) {
 
 static int32_t rewriteShowStreams(STranslateContext* pCxt, SQuery* pQuery) {
   SNode* pDbNode = ((SShowStmt*)pQuery->pRoot)->pDbName;
-  if (nodeType(pDbNode) == QUERY_NODE_VALUE) {
+  if (pDbNode != NULL && nodeType(pDbNode) == QUERY_NODE_VALUE) {
     SArray* pVgs = NULL;
     int32_t code = getDBVgInfo(pCxt, ((SValueNode*)pDbNode)->literal, &pVgs);
     taosArrayDestroy(pVgs);

test/cases/18-StreamProcessing/07-SubQuery/test_subquery_basic.py

@@ -24,7 +24,8 @@ def test_stream_subquery_basic(self):
 
         """
 
-        tdSql.error("show streams")
+        # already supported in v3.4.2.0
+        # tdSql.error("show streams")
         tdSql.error("show xx.streams")
         tdStream.dropAllStreamsAndDbs()
 

test/cases/23-ShowCommands/test_show_basic.py

@@ -5,7 +5,9 @@
 import re
 import os
 import taos
-from new_test_framework.utils import tdLog, tdSql, cluster, sc, clusterComCheck, etool, tdCom, AutoGen, TDSetSql
+import taosrest
+from new_test_framework.utils import tdLog, tdSql, cluster, sc, clusterComCheck, etool, tdCom, AutoGen, TDSetSql, tdStream
+from new_test_framework.utils.server.dnodes import tdDnodes
 
 
 class TestShowBasic:
@@ -817,6 +819,100 @@ def do_show_tag_index(self):
 
         print("do show tag index ..................... [passed]")
 
+    def _assert_show_streams_name_db_rows(self, expected_pairs, require_nonzero=False):
+        """Last query must be SHOW STREAMS (or equivalent); compare (stream_name, db_name) on cols 0 and 3, order-independent."""
+        if require_nonzero:
+            tdSql.checkAssert(tdSql.getRows() > 0)
+        got = [(tdSql.getData(i, 0), tdSql.getData(i, 3)) for i in range(tdSql.getRows())]
+        tdSql.checkEqual(sorted(got), sorted(expected_pairs))
+
+    #
+    # ------------------- show streams without database ----------------
+    #
+    def do_show_streams_no_db(self):
+        """Test SHOW STREAMS works without a selected database and shows db_name column."""
+        tdLog.info("do_show_streams_no_db ..................... [start]")
+
+        # New taos client session (same deploy as conftest get_taos_conn) so current DB is not inherited
+        # from prior steps (e.g. use db). Restore cls.conn cursor in finally for teardown.
+        _saved_conn = self.conn
+        try:
+            tdSql.close()
+        except Exception:
+            pass
+        if getattr(self, "restful", False):
+            _conn = taosrest.connect(url=f"http://{self.host}:6041", timezone="utc")
+        else:
+            _conn = taos.connect(host=self.host, config=tdDnodes.sim.cfgPath)
+        tdSql.init(_conn.cursor(), False)
+        try:
+            tdSql.execute("drop database if exists ss_db1")
+            tdSql.execute("drop database if exists ss_db2")
+            tdSql.execute("create database ss_db1")
+            tdSql.execute("create database ss_db2")
+
+            # Create source tables in each db
+            tdSql.execute("create table ss_db1.src1 (ts timestamp, v int)")
+            tdSql.execute("create table ss_db2.src2 (ts timestamp, v int)")
+
+            # Ensure an snode exists (required for stream creation)
+            tdStream.createSnode(1)
+            # Create a stream in each database
+            tdSql.execute(
+                "create stream ss_db1.ss1 INTERVAL(1s) SLIDING(1s) from ss_db1.src1 into ss_db1.dst1 as select _tlocaltime as ts, count(v) as cnt from ss_db1.src1"
+            )
+            tdSql.execute(
+                "create stream ss_db2.ss2 INTERVAL(1s) SLIDING(1s) from ss_db2.src2 into ss_db2.dst2 as select _tlocaltime as ts, count(v) as cnt from ss_db2.src2"
+            )
+            tdSql.execute(
+                "create stream ss_db1.stm3 count_window(1) from ss_db1.src1 into ss_db1.dst1 as select _tlocaltime as ts, count(v) as cnt from ss_db1.src1"
+            )
+            tdSql.execute(
+                "create stream ss_db2.stm4 count_window(1) from ss_db2.src2 into ss_db2.dst2 as select _tlocaltime as ts, count(v) as cnt from ss_db2.src2"
+            )
+            tdStream.checkStreamStatus()
+
+            # (stream_name, db_name); order-independent — same idea as tdSql.checkEqual(sorted(...), sorted(...)) in e.g. test_write_sml_opentsdb_json.py
+            tdLog.info("check show streams")
+            tdSql.query("show streams")
+            exp_all = [
+                ("stm4", "ss_db2"),
+                ("stm3", "ss_db1"),
+                ("ss2", "ss_db2"),
+                ("ss1", "ss_db1"),
+            ]
+            self._assert_show_streams_name_db_rows(exp_all, require_nonzero=True)
+
+            tdLog.info("check show streams like 'ss%'")
+            tdSql.query("show streams like 'ss%'")
+            exp_ss = [("ss2", "ss_db2"), ("ss1", "ss_db1")]
+            self._assert_show_streams_name_db_rows(exp_ss)
+
+            tdLog.info("check show streams like 'stm%'")
+            tdSql.query("show streams like 'stm%'")
+            exp_stm = [("stm4", "ss_db2"), ("stm3", "ss_db1")]
+            self._assert_show_streams_name_db_rows(exp_stm)
+
+            tdLog.info("check show streams db.streams")
+            tdSql.query("show ss_db1.streams")
+            exp_db1 = [("stm3", "ss_db1"), ("ss1", "ss_db1")]
+            self._assert_show_streams_name_db_rows(exp_db1)
+
+            tdSql.query("show ss_db2.streams")
+            exp_db2 = [("stm4", "ss_db2"), ("ss2", "ss_db2")]
+            self._assert_show_streams_name_db_rows(exp_db2)
+            tdLog.info("do_show_streams_no_db ..................... [passed]")
+        finally:
+            try:
+                tdSql.close()
+            except Exception:
+                pass
+            try:
+                _conn.close()
+            except Exception:
+                pass
+            tdSql.init(_saved_conn.cursor(), False)
+
     #
     # ------------------- main ----------------
     #
@@ -839,6 +935,7 @@ def test_show_basic(self):
            show tags from super table/child table
            show table tags from super table/child table
            show indexes from super table/child table
+        9. Verify SHOW STREAMS works without a selected database and shows db_name column
     
 
         Since: v3.0.0.0
@@ -852,9 +949,11 @@ def test_show_basic(self):
             - 2025-10-17 Alex Duan Migrated from uncatalog/system-test/0-others/test_show.py
             - 2025-4-28 Simon Guan Migrated from tsim/show/basic.sim
             - 2025-11-03 Alex Duan Migrated from uncatalog/system-test/0-others/test_show_tag_index.py
+            - 2026-04-03 Mario Peng Add test_show_streams_no_db
         
         """
         self.do_system_test_show()
         self.do_army_show()
         self.do_sim()
-        self.do_show_tag_index()
+        self.do_show_tag_index()
+        self.do_show_streams_no_db()