From 3e80f57fc73c606324ea79f421252dc8c45be3a6 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 26 Apr 2023 12:09:05 +0800
Subject: [PATCH] refactor: do some internal refactor.

---
 source/dnode/vnode/src/tsdb/tsdbRead.c | 17 ++++++++++++++---
 source/dnode/vnode/src/tsdb/tsdbUtil.c |  2 --
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 79dc9543ba..e797c8df15 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -780,7 +780,6 @@ static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsd
   }
 
   pSup->tsColAgg.colId = PRIMARYKEY_TIMESTAMP_COL_ID;
-
   setColumnIdSlotList(pSup, pCond->colList, pCond->pSlotList, pCond->numOfCols);
 
   code = tBlockDataCreate(&pReader->status.fileBlockData);
@@ -789,8 +788,21 @@ static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsd
     goto _end;
   }
 
-  ASSERT (pReader->suppInfo.colId[0] == PRIMARYKEY_TIMESTAMP_COL_ID);
+
+  if (pReader->suppInfo.colId[0] == PRIMARYKEY_TIMESTAMP_COL_ID) {
+    tsdbError("the first column isn't primary timestamp, %d, %s", pReader->suppInfo.colId[0], pReader->idStr);
+    terrno = TSDB_CODE_INVALID_PARA;
+    goto _end;
+  }
+
   pReader->status.pPrimaryTsCol = taosArrayGet(pReader->pResBlock->pDataBlock, pSup->slotId[0]);
+  int32_t type = pReader->status.pPrimaryTsCol->info.type;
+  if (type != TSDB_DATA_TYPE_TIMESTAMP) {
+    tsdbError("the first column isn't primary timestamp in result block, actual: %s, %s", tDataTypes[type].name,
+              pReader->idStr);
+    terrno = TSDB_CODE_INVALID_PARA;
+    goto _end;
+  }
 
   tsdbInitReaderLock(pReader);
 
@@ -2952,7 +2964,6 @@ static int32_t moveToNextFile(STsdbReader* pReader, SBlockNumber* pBlockNum, SAr
       }
 
       if (pBlockNum->numOfBlocks + pBlockNum->numOfLastFiles > 0) {
-//        ASSERT(taosArrayGetSize(pTableList) > 0);
         break;
       }
     }
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index d8b0fc7c45..d4ff92f7d2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -1051,8 +1051,6 @@ int32_t tBlockDataCreate(SBlockData *pBlockData) {
   pBlockData->aTSKEY = NULL;
   pBlockData->nColData = 0;
   pBlockData->aColData = NULL;
-
-_exit:
   return code;
 }
 
-- 
GitLab