diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 200fd2bc46..d712a381e7 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -573,7 +573,6 @@ int32_t blockDataSplitRows(SSDataBlock* pBlock, bool hasVarCol, int32_t startInd for (int32_t j = startIndex; j < numOfRows; ++j) { for (int32_t i = 0; i < numOfCols; ++i) { SColumnInfoData* pColInfoData = TARRAY_GET_ELEM(pBlock->pDataBlock, i); - if (pColInfoData->pData == NULL) continue; if (IS_VAR_DATA_TYPE(pColInfoData->info.type)) { if (pColInfoData->varmeta.offset[j] != -1) { char* p = colDataGetData(pColInfoData, j); @@ -632,7 +631,6 @@ SSDataBlock* blockDataExtractBlock(SSDataBlock* pBlock, int32_t startIndex, int3 for (int32_t i = 0; i < numOfCols; ++i) { SColumnInfoData* pColData = taosArrayGet(pBlock->pDataBlock, i); SColumnInfoData* pDstCol = taosArrayGet(pDst->pDataBlock, i); - if (pColData->pData == NULL) continue; for (int32_t j = startIndex; j < (startIndex + rowCount); ++j) { bool isNull = false; if (pBlock->pBlockAgg == NULL) { diff --git a/source/libs/executor/src/mergejoinoperator.c b/source/libs/executor/src/mergejoinoperator.c index 7f12d9d225..b4461f20b1 100644 --- a/source/libs/executor/src/mergejoinoperator.c +++ b/source/libs/executor/src/mergejoinoperator.c @@ -399,9 +399,7 @@ static void mergeJoinJoinLeftRight(struct SOperatorInfo* pOperator, SSDataBlock* colDataSetNULL(pDst, currRow); } else { char* p = colDataGetData(pSrc, rowIndex); - if (p != NULL) { - colDataSetVal(pDst, currRow, p, false); - } + colDataSetVal(pDst, currRow, p, false); } } } diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index 892eb38c88..a4bb94e494 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -3344,23 +3344,6 @@ static int32_t subTblRowCompareFn(const void* pLeft, const void* pRight, void* p return ret; } -static void blockDataDeepCleanup(SSDataBlock* pDataBlock) { - size_t numOfCols = taosArrayGetSize(pDataBlock->pDataBlock); - for (int32_t i = 0; i < numOfCols; ++i) { - SColumnInfoData* p = taosArrayGet(pDataBlock->pDataBlock, i); - taosMemoryFreeClear(p->pData); - if (IS_VAR_DATA_TYPE(p->info.type)) { - taosMemoryFreeClear(p->varmeta.offset); - p->varmeta.length = 0; - p->varmeta.allocLen = 0; - } else { - taosMemoryFreeClear(p->nullbitmap); - } - } - pDataBlock->info.capacity = 0; - pDataBlock->info.rows = 0; -} - int32_t dumpQueryTableCond(const SQueryTableDataCond* src, SQueryTableDataCond* dst) { memcpy((void*)dst, (void*)src, sizeof(SQueryTableDataCond)); dst->colList = taosMemoryCalloc(src->numOfCols, sizeof(SColumnInfo)); @@ -3469,11 +3452,7 @@ static int32_t saveSubTableBlock(const STableMergeScanInfo* pInfo, STmsSubTables blockDataDestroy(p); start = stop + 1; } - if (!pInput->bInMemReader) { - blockDataDeepCleanup(pInput->pReaderBlock); - } else { - blockDataCleanup(pInput->pReaderBlock); - } + return TSDB_CODE_SUCCESS; } @@ -3660,9 +3639,10 @@ static int32_t appendChosenRowToDataBlock(STmsSubTablesMergeInfo* pSubTblsInfo, if (isNull) { colDataSetVal(pColInfo, pBlock->info.rows, NULL, true); } else { - if (!pSrcColInfo->pData) continue; - char* pData = colDataGetData(pSrcColInfo, pInput->rowIdx); - colDataSetVal(pColInfo, pBlock->info.rows, pData, false); + if (pSrcColInfo->pData != NULL) { + char* pData = colDataGetData(pSrcColInfo, pInput->rowIdx); + colDataSetVal(pColInfo, pBlock->info.rows, pData, false); + } } } pBlock->info.dataLoad = 1;