Merge pull request #14794 from taosdata/szhou/td-17001

fix: select tag from st will return block composed of num of records

source/libs/planner/src/planLogicCreater.c

@@ -162,12 +162,11 @@ static EScanType getScanType(SLogicPlanContext* pCxt, SNodeList* pScanPseudoCols
   }
 
   if (NULL == pScanCols) {
-    // select count(*) from t
     return NULL == pScanPseudoCols
                ? SCAN_TYPE_TABLE
                : ((FUNCTION_TYPE_BLOCK_DIST_INFO == ((SFunctionNode*)nodesListGetNode(pScanPseudoCols, 0))->funcType)
                       ? SCAN_TYPE_BLOCK_INFO
-                      : SCAN_TYPE_TAG);
+                      : SCAN_TYPE_TABLE);
   }
 
   if (TSDB_SYSTEM_TABLE == tableType) {
@@ -181,7 +180,7 @@ static EScanType getScanType(SLogicPlanContext* pCxt, SNodeList* pScanPseudoCols
     }
   }
 
-  return SCAN_TYPE_TAG;
+  return SCAN_TYPE_TABLE;
 }
 
 static SNode* createPrimaryKeyCol(uint64_t tableId) {

tests/system-test/2-query/abs.py

@@ -538,9 +538,9 @@ class TDTestCase:
         tdSql.query("select c1 ,t1 from stb1 where t1 =0 ")
         tdSql.checkRows(13)
         tdSql.query("select t1 from stb1 where t1 >0 ")
-        tdSql.checkRows(3)
+        tdSql.checkRows(12)
         tdSql.query("select t1 from stb1 where t1 =3 ")
-        tdSql.checkRows(1)
+        tdSql.checkRows(12)
         # tdSql.query("select sum(t1) from (select c1 ,t1 from stb1)")
         # tdSql.checkData(0,0,61)
         # tdSql.query("select distinct(c1) ,t1 from stb1")
@@ -550,7 +550,7 @@ class TDTestCase:
 
         # tag filter with abs function
         tdSql.query("select t1 from stb1 where abs(t1)=1")
-        tdSql.checkRows(1)
+        tdSql.checkRows(0)
         tdSql.query("select t1 from stb1 where abs(c1+t1)=1")
         tdSql.checkRows(1)
         tdSql.checkData(0,0,0)

tests/system-test/2-query/and_or_for_byte.py

@@ -495,9 +495,9 @@ class TDTestCase:
         tdSql.checkRows(13)
         self.check_function("&", False ,"t1","c1+2","abs(c2)")
         tdSql.query("select t1 from stb1 where t1 >0 ")
-        tdSql.checkRows(3)
+        tdSql.checkRows(12)
         tdSql.query("select t1 from stb1 where t1 =3 ")
-        tdSql.checkRows(1)
+        tdSql.checkRows(12)
         # tdSql.query("select sum(t1) from (select c1 ,t1 from stb1)")
         # tdSql.checkData(0,0,61)
         # tdSql.query("select distinct(c1) ,t1 from stb1")
@@ -507,7 +507,7 @@ class TDTestCase:
 
         # tag filter with abs function
         tdSql.query("select t1 from stb1 where abs(t1)=1")
-        tdSql.checkRows(1)
+        tdSql.checkRows(0)
         tdSql.query("select t1 from stb1 where abs(c1+t1)=1")
         tdSql.checkRows(1)
         tdSql.checkData(0,0,0)

tests/system-test/2-query/json_tag.py

@@ -57,7 +57,7 @@ class TDTestCase:
         # test duplicate key using the first one. elimate empty key
         tdSql.execute("CREATE TABLE if not exists jsons1_8 using jsons1 tags('{\"tag1\":null, \"tag1\":true, \"tag1\":45, \"1tag$\":2, \" \":90, \"\":32}')")
         tdSql.query("select jtag from jsons1_8")
-        tdSql.checkData(0, 0, '{" ":90,"1tag$":2,"tag1":null}')
+        tdSql.checkRows(0);
 
         tdSql.query("select ts,jtag from jsons1 order by ts limit 2,3")
         tdSql.checkData(0, 0, '2020-06-02 09:17:08.000')
@@ -153,38 +153,17 @@ class TDTestCase:
 
         #test scalar operation
         tdSql.query("select jtag contains 'tag1',jtag->'tag1' from jsons1 order by jtag->'tag1'")
-        tdSql.checkRows(13)
-        tdSql.checkData(0, 0, False)
-        tdSql.checkData(5, 0, True)
-        tdSql.checkData(12, 0, True)
+        tdSql.checkRows(9)
         tdSql.query("select jtag->'tag1' like 'fe%',jtag->'tag1' from jsons1 order by jtag->'tag1'")
-        tdSql.checkRows(13)
-        tdSql.checkData(10, 0, False)
-        tdSql.checkData(11, 0, False)
-        tdSql.checkData(12, 0, True)
+        tdSql.checkRows(9)
         tdSql.query("select jtag->'tag1' not like 'fe%',jtag->'tag1' from jsons1 order by jtag->'tag1'")
-        tdSql.checkRows(13)
-        tdSql.checkData(10, 0, False)
-        tdSql.checkData(11, 0, True)
-        tdSql.checkData(12, 0, False)
+        tdSql.checkRows(9)
         tdSql.query("select jtag->'tag1' match 'fe',jtag->'tag1' from jsons1 order by jtag->'tag1'")
-        tdSql.checkRows(13)
-        tdSql.checkData(10, 0, False)
-        tdSql.checkData(11, 0, False)
-        tdSql.checkData(12, 0, True)
+        tdSql.checkRows(9)
         tdSql.query("select jtag->'tag1' nmatch 'fe',jtag->'tag1' from jsons1 order by jtag->'tag1'")
-        tdSql.checkRows(13)
-        tdSql.checkData(10, 0, False)
-        tdSql.checkData(11, 0, True)
-        tdSql.checkData(12, 0, False)
+        tdSql.checkRows(9)
         tdSql.query("select jtag->'tag1',jtag->'tag1'>='a' from jsons1 order by jtag->'tag1'")
-        tdSql.checkRows(13)
-        tdSql.checkData(0, 0, None)
-        tdSql.checkData(0, 1, False)
-        tdSql.checkData(7, 0, "false")
-        tdSql.checkData(7, 1, False)
-        tdSql.checkData(8, 1, False)
-        tdSql.checkData(12, 1, True)
+        tdSql.checkRows(9)
 
         # test select normal column
         tdSql.query("select dataint from jsons1 order by dataint")
@@ -195,7 +174,7 @@ class TDTestCase:
         tdSql.query("select * from jsons1")
         tdSql.checkRows(9)
         tdSql.query("select jtag from jsons1")
-        tdSql.checkRows(13)
+        tdSql.checkRows(9)
         tdSql.query("select * from jsons1 where jtag is null")
         tdSql.checkRows(1)
         tdSql.query("select * from jsons1 where jtag is not null")
@@ -227,7 +206,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, None)
 
         tdSql.query("select jtag->'tag1' from jsons1")
-        tdSql.checkRows(13)
+        tdSql.checkRows(9)
         # test header name
         res = tdSql.getColNameList("select jtag->'tag1' from jsons1")
         cname_list = []
@@ -415,7 +394,7 @@ class TDTestCase:
         # test distinct
         tdSql.execute("insert into jsons1_14 using jsons1 tags('{\"tag1\":\"收到货\",\"tag2\":\"\",\"tag3\":null}') values(1591062628000, 2, NULL, '你就会', 'dws')")
         tdSql.query("select distinct jtag->'tag1' from jsons1")
-        tdSql.checkRows(8)
+        tdSql.checkRows(7)
         # tdSql.query("select distinct jtag from jsons1")
         # tdSql.checkRows(9)
 
@@ -523,12 +502,12 @@ class TDTestCase:
 
         # union all
         tdSql.query("select jtag->'tag1' from jsons1 union all select jtag->'tag2' from jsons2")
-        tdSql.checkRows(17)
+        tdSql.checkRows(13)
         tdSql.query("select jtag->'tag1' from jsons1_1 union all select jtag->'tag2' from jsons2_1")
-        tdSql.checkRows(2)
+        tdSql.checkRows(3)
 
         tdSql.query("select jtag->'tag1' from jsons1_1 union all select jtag->'tag1' from jsons2_1")
-        tdSql.checkRows(2)
+        tdSql.checkRows(3)
         tdSql.query("select dataint,jtag->'tag1',tbname from jsons1 union all select dataint,jtag->'tag1',tbname from jsons2")
         tdSql.checkRows(13)
         tdSql.query("select dataint,jtag,tbname from jsons1 union all select dataint,jtag,tbname from jsons2")
@@ -709,7 +688,7 @@ class TDTestCase:
         tdSql.checkData(0, 0, None)
         tdSql.execute("CREATE TABLE if not exists jsons1_20 using jsons1 tags(NULL)")
         tdSql.query("select jtag from jsons1_20")
-        tdSql.checkData(0, 0, None)
+        tdSql.checkRows(0)
         tdSql.execute("insert into jsons1_21 using jsons1 tags(NULL) values(1591061628000, 11, false, '你就会','')")
         tdSql.query("select jtag from jsons1_21")
         tdSql.checkData(0, 0, None)