Merge pull request #22471 from taosdata/fix/m/TD-24871

fix: get systable cols error

source/dnode/mnode/impl/src/mndStb.c

@@ -3159,42 +3159,65 @@ static int32_t buildDbColsInfoBlock(const SSDataBlock *p, const SSysTableMeta *p
 
   return numOfRows;
 }
+#define BUILD_COL_FOR_INFO_DB 1
+#define BUILD_COL_FOR_PERF_DB 1 << 1
+#define BUILD_COL_FOR_USER_DB 1 << 2
+#define BUILD_COL_FOR_ALL_DB  (BUILD_COL_FOR_INFO_DB | BUILD_COL_FOR_PERF_DB | BUILD_COL_FOR_USER_DB)
 
-static int32_t buildSysDbColsInfo(SSDataBlock *p, char *db, char *tb) {
+static int32_t buildSysDbColsInfo(SSDataBlock *p, int8_t buildWhichDBs, char *tb) {
   size_t               size = 0;
   const SSysTableMeta *pSysDbTableMeta = NULL;
 
-  if (db[0] && strncmp(db, TSDB_INFORMATION_SCHEMA_DB, TSDB_DB_FNAME_LEN) != 0 &&
-      strncmp(db, TSDB_PERFORMANCE_SCHEMA_DB, TSDB_DB_FNAME_LEN) != 0) {
-    return p->info.rows;
-  }
-
+  if (buildWhichDBs & BUILD_COL_FOR_INFO_DB) {
     getInfosDbMeta(&pSysDbTableMeta, &size);
     p->info.rows = buildDbColsInfoBlock(p, pSysDbTableMeta, size, TSDB_INFORMATION_SCHEMA_DB, tb);
+  }
 
+  if (buildWhichDBs & BUILD_COL_FOR_PERF_DB) {
     getPerfDbMeta(&pSysDbTableMeta, &size);
     p->info.rows = buildDbColsInfoBlock(p, pSysDbTableMeta, size, TSDB_PERFORMANCE_SCHEMA_DB, tb);
+  }
 
   return p->info.rows;
 }
 
+static int8_t determineBuildColForWhichDBs(const char* db) {
+  int8_t buildWhichDBs;
+  if (!db[0])
+    buildWhichDBs = BUILD_COL_FOR_ALL_DB;
+  else {
+    char *p = strchr(db, '.');
+    if (p && strcmp(p + 1, TSDB_INFORMATION_SCHEMA_DB) == 0) {
+      buildWhichDBs = BUILD_COL_FOR_INFO_DB;
+    } else if (p && strcmp(p + 1, TSDB_PERFORMANCE_SCHEMA_DB) == 0) {
+      buildWhichDBs = BUILD_COL_FOR_PERF_DB;
+    } else {
+      buildWhichDBs = BUILD_COL_FOR_USER_DB;
+    }
+  }
+  return buildWhichDBs;
+}
+
 static int32_t mndRetrieveStbCol(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
+  uint8_t buildWhichDBs;
   SMnode  *pMnode = pReq->info.node;
   SSdb    *pSdb = pMnode->pSdb;
   SStbObj *pStb = NULL;
+  int32_t numOfRows = 0;
 
+  buildWhichDBs = determineBuildColForWhichDBs(pShow->db);
 
-  int32_t numOfRows = 0;
   if (!pShow->sysDbRsp) {
-    numOfRows = buildSysDbColsInfo(pBlock, pShow->db, pShow->filterTb);
+    numOfRows = buildSysDbColsInfo(pBlock, buildWhichDBs, pShow->filterTb);
     mDebug("mndRetrieveStbCol get system table cols, rows:%d, db:%s", numOfRows, pShow->db);
     pShow->sysDbRsp = true;
   }
 
+  if (buildWhichDBs & BUILD_COL_FOR_USER_DB) {
     SDbObj *pDb = NULL;
     if (strlen(pShow->db) > 0) {
       pDb = mndAcquireDb(pMnode, pShow->db);
-    if (pDb == NULL) return terrno;
+      if (pDb == NULL && TSDB_CODE_MND_DB_NOT_EXIST != terrno && pBlock->info.rows == 0) return terrno;
     }
 
     char typeName[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
@@ -3291,6 +3314,7 @@ static int32_t mndRetrieveStbCol(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     if (pDb != NULL) {
       mndReleaseDb(pMnode, pDb);
     }
+  }
 
   pShow->numOfRows += numOfRows;
   mDebug("mndRetrieveStbCol success, rows:%d, pShow->numOfRows:%d", numOfRows, pShow->numOfRows);

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

@@ -216,6 +216,12 @@ class TDTestCase:
             tdSql.query(f'select * from information_schema.ins_columns where db_name="db2" and table_type=="NORMAL_TABLE"')
             tdSql.checkEqual(20470,len(tdSql.queryResult))
 
+        tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'")
+        tdSql.checkEqual(195, len(tdSql.queryResult))
+
+        tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'")
+        tdSql.checkEqual(54, len(tdSql.queryResult))
+
     def ins_dnodes_check(self):
         tdSql.execute('drop database if exists db2')
         tdSql.execute('create database if not exists db2 vgroups 1 replica 1')