diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c
index 3f9e61dbbb6aca270c498fede7188c235e4aafd3..88d9fb1a1f5b4a4f52fead820c4b00981d64e01e 100644
--- a/source/libs/executor/src/sysscanoperator.c
+++ b/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);
diff --git a/tests/script/tsim/compute/block_dist.sim b/tests/script/tsim/compute/block_dist.sim
index 4fdcf63e34f5c5949d87f9b02cc3b620c87bd429..772959644eb271e1119984d502ba336b8af2754b 100644
--- a/tests/script/tsim/compute/block_dist.sim
+++ b/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
diff --git a/tests/script/tsim/parser/regressiontest.sim b/tests/script/tsim/parser/regressiontest.sim
index c08b1bbf27e81a3fdc719271e6e0f539176dcd35..1a18d1795c11df3809b4507d25352b0e1d531dd6 100644
--- a/tests/script/tsim/parser/regressiontest.sim
+++ b/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);