Merge pull request #19966 from taosdata/fix/nodisk

fix(query): check validation of suid

source/libs/executor/src/sysscanoperator.c

@@ -2001,7 +2001,7 @@ SOperatorInfo* createDataBlockInfoScanOperator(SReadHandle* readHandle, SBlockDi
   }
 
   pInfo->readHandle = *readHandle;
-  pInfo->uid = pBlockScanNode->suid;
+  pInfo->uid = (pBlockScanNode->suid != 0)? pBlockScanNode->suid:pBlockScanNode->uid;
 
   int32_t    numOfCols = 0;
   SExprInfo* pExprInfo = createExprInfo(pBlockScanNode->pScanPseudoCols, NULL, &numOfCols);

tests/script/tsim/compute/block_dist.sim

@@ -81,7 +81,6 @@ $nt = $ntPrefix . $i
 
 #sql select _block_dist() from $nt
 print show table distributed $nt
-sql_error show table distributed $nt
 
 #if $rows == 0 then
 #  return -1

tests/script/tsim/parser/regressiontest.sim

@@ -143,9 +143,11 @@ sql delete from t1 where ts<=1537146409500
 
 sql flush database $db
 
+print ======================================>TS-2639
+sql show table distributed t1;
+
 print =====================================>TD-22007
 sql select count(*) from t1 interval(10a)
-
 sql drop table t1
 
 sql create table st1 (ts timestamp, k int) tags(a int);