From 2bbeeb5c5b69c3c826868564c683847fdcafc822 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Sat, 30 Apr 2022 15:44:06 +0800 Subject: [PATCH] refactor: do some internal refactor. --- source/common/src/tdatablock.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index e237f61e20..b065ba4fd4 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -251,7 +251,7 @@ int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, uint32_t numOfRow1, in pColumnInfoData->varmeta.length = len + oldLen; } else { if (finalNumOfRows > *capacity) { - char* tmp = taosMemoryRealloc(pColumnInfoData->pData, finalNumOfRows); + char* tmp = taosMemoryRealloc(pColumnInfoData->pData, finalNumOfRows * pColumnInfoData->info.bytes); if (tmp == NULL) { return TSDB_CODE_VND_OUT_OF_MEMORY; } @@ -372,18 +372,18 @@ int32_t blockDataMerge(SSDataBlock* pDest, const SSDataBlock* pSrc, SArray* pInd SColumnInfoData* pCol2 = taosArrayGet(pDest->pDataBlock, i); SColumnInfoData* pCol1 = taosArrayGet(pSrc->pDataBlock, mapIndex); - uint32_t oldLen = colDataGetLength(pCol2, pDest->info.rows); - uint32_t newLen = colDataGetLength(pCol1, pSrc->info.rows); +// uint32_t oldLen = colDataGetLength(pCol2, pDest->info.rows); +// uint32_t newLen = colDataGetLength(pCol1, pSrc->info.rows); - int32_t newSize = oldLen + newLen; - char* tmp = taosMemoryRealloc(pCol2->pData, newSize); - if (tmp != NULL) { - pCol2->pData = tmp; +// int32_t newSize = oldLen + newLen; +// char* tmp = taosMemoryRealloc(pCol2->pData, newSize); +// if (tmp != NULL) { +// pCol2->pData = tmp; capacity = pDest->info.capacity; colDataMergeCol(pCol2, pDest->info.rows, &capacity, pCol1, pSrc->info.rows); - } else { - return TSDB_CODE_VND_OUT_OF_MEMORY; - } +// } else { +// return TSDB_CODE_VND_OUT_OF_MEMORY; +// } } pDest->info.capacity = capacity;