From 8f92dc614d7409054e49cbb2b2672216133d9590 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 11 Apr 2024 19:01:23 +0800 Subject: [PATCH] fix(tsdb):add some logs. --- source/common/src/tdatablock.c | 12 ++++++++---- source/libs/executor/src/tsort.c | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index 20c4fa64c4..fdb72a9d5f 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -1332,6 +1332,8 @@ void* blockDataDestroy(SSDataBlock* pBlock) { } if (IS_VAR_DATA_TYPE(pBlock->info.pks[0].type)) { + uInfo("1====free pk:%p, %p pBlock", pBlock->info.pks[0].pData, pBlock); + uInfo("2====free pk:%p, %p pBlock", pBlock->info.pks[1].pData, pBlock); taosMemoryFreeClear(pBlock->info.pks[0].pData); taosMemoryFreeClear(pBlock->info.pks[1].pData); } @@ -1503,11 +1505,13 @@ SSDataBlock* createOneDataBlock(const SSDataBlock* pDataBlock, bool copyData) { pVal->type = pDataBlock->info.pks[0].type; pVal->pData = taosMemoryCalloc(1, pDataBlock->info.pks[0].nData); pVal->nData = pDataBlock->info.pks[0].nData; + memcpy(pVal->pData, pDataBlock->info.pks[0].pData, pVal->nData); - pVal = &pBlock->info.pks[1]; - pVal->type = pDataBlock->info.pks[1].type; - pVal->pData = taosMemoryCalloc(1, pDataBlock->info.pks[1].nData); - pVal->nData = pDataBlock->info.pks[1].nData; + SValue* p = &pBlock->info.pks[1]; + p->type = pDataBlock->info.pks[1].type; + p->pData = taosMemoryCalloc(1, pDataBlock->info.pks[1].nData); + p->nData = pDataBlock->info.pks[1].nData; + memcpy(p->pData, pDataBlock->info.pks[1].pData, p->nData); } if (copyData) { diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c index 44404c345e..3dbf29e3a8 100644 --- a/source/libs/executor/src/tsort.c +++ b/source/libs/executor/src/tsort.c @@ -1649,8 +1649,8 @@ static SSDataBlock* getRowsBlockWithinMergeLimit(const SSortHandle* pHandle, SSH } static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) { - size_t nSrc = taosArrayGetSize(pHandle->pOrderedSource); - SArray* aExtSrc = taosArrayInit(nSrc, POINTER_BYTES); + size_t nSrc = taosArrayGetSize(pHandle->pOrderedSource); + SArray* aExtSrc = taosArrayInit(nSrc, POINTER_BYTES); size_t maxBufSize = (pHandle->bSortByRowId) ? pHandle->extRowsMemSize : (pHandle->numOfPages * pHandle->pageSize);