xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(query): remove invalid free.

This commit is contained in:
Haojun Liao 2022-07-16 19:44:08 +08:00
parent 76f451744a
commit 5a5e30c456
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/executor/src/executorimpl.c
View File

@ -2217,6 +2217,8 @@ static SSDataBlock* concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SEx
if (completed == totalSources) { if (completed == totalSources) {
return setAllSourcesCompleted(pOperator, startTs); return setAllSourcesCompleted(pOperator, startTs);
} }
sched_yield();
} }
_error: _error:
@ -3743,7 +3745,7 @@ void doDestroyExchangeOperatorInfo(void* param) {
taosArrayDestroy(pExInfo->pSources); taosArrayDestroy(pExInfo->pSources);
taosArrayDestroy(pExInfo->pSourceDataInfo); taosArrayDestroy(pExInfo->pSourceDataInfo);
if (pExInfo->pResult != NULL) { if (pExInfo->pResult != NULL) {
blockDataDestroy(pExInfo->pResult); pExInfo->pResult = blockDataDestroy(pExInfo->pResult);
} }
tsem_destroy(&pExInfo->ready); tsem_destroy(&pExInfo->ready);

1
source/libs/executor/src/tsort.c
View File

@ -119,7 +119,6 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) {
blockDataDestroy(pSortHandle->pDataBlock); blockDataDestroy(pSortHandle->pDataBlock);
for (size_t i = 0; i < taosArrayGetSize(pSortHandle->pOrderedSource); i++){ for (size_t i = 0; i < taosArrayGetSize(pSortHandle->pOrderedSource); i++){
SSortSource** pSource = taosArrayGet(pSortHandle->pOrderedSource, i); SSortSource** pSource = taosArrayGet(pSortHandle->pOrderedSource, i);
blockDataDestroy((*pSource)->src.pBlock);
taosMemoryFreeClear(*pSource); taosMemoryFreeClear(*pSource);
} }
taosArrayDestroy(pSortHandle->pOrderedSource); taosArrayDestroy(pSortHandle->pOrderedSource);