Merge pull request #28703 from taosdata/fix/main/TS-5580

fix:[TS-5580] Fix wrong tag num from ins_tags.

source/libs/executor/src/sysscanoperator.c

@@ -685,11 +685,11 @@ static SSDataBlock* sysTableScanUserCols(SOperatorInfo* pOperator) {
         pAPI->metaFn.pauseTableMetaCursor(pInfo->pCur);
         break;
       }
-    } else {
+    }
+    // if pInfo->pRes->info.rows == 0, also need to add the meta to pDataBlock
     code = sysTableUserColsFillOneTableCols(pInfo, dbname, &numOfRows, pDataBlock, tableName, schemaRow, typeName);
     QUERY_CHECK_CODE(code, lino, _end);
   }
-  }
 
   if (numOfRows > 0) {
     pAPI->metaFn.pauseTableMetaCursor(pInfo->pCur);
@@ -761,7 +761,7 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
 
     SMetaReader smrChildTable = {0};
     pAPI->metaReaderFn.initReader(&smrChildTable, pInfo->readHandle.vnode, META_READER_LOCK, &pAPI->metaFn);
-    int32_t code = pAPI->metaReaderFn.getTableEntryByName(&smrChildTable, condTableName);
+    code = pAPI->metaReaderFn.getTableEntryByName(&smrChildTable, condTableName);
     if (code != TSDB_CODE_SUCCESS) {
       // terrno has been set by pAPI->metaReaderFn.getTableEntryByName, therefore, return directly
       pAPI->metaReaderFn.clearReader(&smrChildTable);
@@ -847,7 +847,8 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
         pAPI->metaReaderFn.clearReader(&smrSuperTable);
         break;
       }
-    } else {
+    }
+    // if pInfo->pRes->info.rows == 0, also need to add this meta into datablock.
     code = sysTableUserTagsFillOneTableTags(pInfo, &smrSuperTable, &pInfo->pCur->mr, dbname, tableName, &numOfRows,
                                             dataBlock);
     if (code != TSDB_CODE_SUCCESS) {
@@ -859,7 +860,6 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
       dataBlock = NULL;
       T_LONG_JMP(pTaskInfo->env, terrno);
     }
-    }
     pAPI->metaReaderFn.clearReader(&smrSuperTable);
   }
 

tests/parallel_test/cases.task

@@ -327,6 +327,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TS-3311.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TS-3821.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TS-5130.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TS-5580.py
 
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/balance_vgroups_r1.py -N 6
 ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosShell.py

tests/system-test/99-TDcase/TS-5580.py

@@ -0,0 +1,118 @@
+###################################################################
+#           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 time
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.common import *
+from util.sqlset import *
+
+class TDTestCase:
+    updatecfgDict = {'qDebugFlag':135 , 'mDebugFlag':135}
+
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), True)
+        self.setsql = TDSetSql()
+        self.dbname = 'db'
+        self.stbname = 'stb'
+        self.binary_length = 20 # the length of binary for column_dict
+        self.nchar_length = 20  # the length of nchar for column_dict
+        self.ts = 1537146000000
+        self.column_dict = {
+            'ts'  : 'timestamp',
+            'col1': 'tinyint',
+            'col2': 'smallint',
+            'col3': 'int',
+            'col4': 'bigint',
+            'col5': 'float',
+            'col6': 'double',
+            'col7': 'double',
+            'col8': 'double',
+            'col9': 'double',
+            'col10': 'double',
+            'col11': 'double',
+            'col12': 'double',
+            'col13': 'double',
+            'col14': 'double',
+            'col15': 'double',
+            'col16': 'double',
+            'col17': 'double',
+            'col18': 'double',
+            'col19': 'double'
+        }
+        self.tbnum = 500
+        self.rowNum = 10
+        self.tag_dict = {
+            't0':'int',
+            't1':'bigint',
+            't2':'float',
+            't3':'double',
+            't4':'bool',
+            't5':'bool',
+            't6':'bool',
+            't7':'bool',
+            't8':'bool',
+            't9':'bool',
+            't10':'bool',
+            't11':'bool',
+            't12':'bool',
+            't13':'bool',
+            't14':'bool',
+            't15':'bool',
+            't16':'bool',
+            't17':'bool',
+            't18':'bool',
+            't19':'bool',
+        }
+        self.tag_values = [
+            f'1','1','1','1','true','true','true','true','true','true','true','true','true','true','true','true','true',
+            'true','true','true'
+        ]
+    def prepare_data(self):
+        tdSql.execute(f"create database if not exists {self.dbname} vgroups 2")
+        tdSql.execute(f'use {self.dbname}')
+        tdSql.execute(self.setsql.set_create_stable_sql(self.stbname,self.column_dict,self.tag_dict))
+        for i in range(self.tbnum):
+            tdSql.execute(f"create table {self.stbname}_{i} using {self.stbname} tags({self.tag_values[0]}, {self.tag_values[1]}, "
+                          f"{self.tag_values[2]}, {self.tag_values[3]}, {self.tag_values[4]}, {self.tag_values[5]}, "
+                          f"{self.tag_values[6]}, {self.tag_values[7]}, {self.tag_values[8]}, {self.tag_values[9]}, "
+                          f"{self.tag_values[10]}, {self.tag_values[11]}, {self.tag_values[12]}, {self.tag_values[13]}, "
+                          f"{self.tag_values[14]}, {self.tag_values[15]}, {self.tag_values[16]}, {self.tag_values[17]}, "
+                          f"{self.tag_values[18]}, {self.tag_values[19]})")
+
+    def test_query_ins_tags(self):
+        for i in range(self.tbnum):
+            sql = f'select tag_name, tag_value from information_schema.ins_tags where table_name = "{self.stbname}_{i}"'
+            tdSql.query(sql)
+            tdSql.checkRows(20)
+
+    def test_query_ins_columns(self):
+        for i in range(self.tbnum):
+            sql = f'select col_name from information_schema.ins_columns where table_name = "{self.stbname}_{i}"'
+            tdSql.query(sql)
+            tdSql.checkRows(20)
+    def run(self):
+        self.prepare_data()
+        self.test_query_ins_tags()
+        self.test_query_ins_columns()
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())