<fix>[query]: reset the null value bitmap before fetch next data block from tsdb. TD-14581.

include/common/tcommon.h

@@ -67,6 +67,7 @@ typedef struct SDataBlockInfo {
   int32_t     rowSize;
   int16_t     numOfCols;
   int16_t     hasVarCol;
+  int16_t     capacity;
   union {
     int64_t uid;
     int64_t blockId;

include/common/tdatablock.h

@@ -196,7 +196,10 @@ int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullF
 
 int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows);
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows);
+
+int32_t colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows);
 void    blockDataCleanup(SSDataBlock* pDataBlock);
+
 size_t  blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize);
 void*   blockDataDestroy(SSDataBlock* pBlock);
 

source/common/src/tdatablock.c

@@ -1171,15 +1171,9 @@ int32_t blockDataSort_rv(SSDataBlock* pDataBlock, SArray* pOrderInfo, bool nullF
 
 void blockDataCleanup(SSDataBlock* pDataBlock) {
   pDataBlock->info.rows = 0;
-
-  if (pDataBlock->info.hasVarCol) {
-    for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
-      SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
-
-      if (IS_VAR_DATA_TYPE(p->info.type)) {
-        p->varmeta.length = 0;
-      }
-    }
+  for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
+    SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
+    colInfoDataCleanup(p, pDataBlock->info.capacity);
   }
 }
 
@@ -1220,12 +1214,22 @@ int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows)
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t colInfoDataCleanup(SColumnInfoData* pColumn, uint32_t numOfRows) {
+  if (IS_VAR_DATA_TYPE(pColumn->info.type)) {
+    pColumn->varmeta.length = 0;
+  } else {
+    memset(pColumn->nullbitmap, 0, BitmapLen(numOfRows));
+  }
+}
+
 int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows) {
   int32_t code = 0;
   if (numOfRows == 0) {
     return TSDB_CODE_SUCCESS;
   }
 
+  pDataBlock->info.capacity = numOfRows;
+
   for (int32_t i = 0; i < pDataBlock->info.numOfCols; ++i) {
     SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i);
     code = colInfoDataEnsureCapacity(p, numOfRows);

source/dnode/vnode/src/tsdb/tsdbRead.c

@@ -3254,6 +3254,11 @@ SArray* tsdbRetrieveDataBlock(tsdbReaderT* pTsdbReadHandle, SArray* pIdList) {
    */
   STsdbReadHandle* pHandle = (STsdbReadHandle*)pTsdbReadHandle;
 
+  for(int32_t i = 0; i < taosArrayGetSize(pHandle->pColumns); ++i) {
+    SColumnInfoData* pColInfo = taosArrayGet(pHandle->pColumns, i);
+    colInfoDataCleanup(pColInfo, pHandle->outputCapacity);
+  }
+
   if (pHandle->cur.fid == INT32_MIN) {
     return pHandle->pColumns;
   } else {