提交 5a5e30c4 编写于 作者: H Haojun Liao

fix(query): remove invalid free.

上级 76f45174
...@@ -2217,6 +2217,8 @@ static SSDataBlock* concurrentlyLoadRemoteDataImpl(SOperatorInfo* pOperator, SEx ...@@ -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) { ...@@ -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);
......
...@@ -119,7 +119,6 @@ void tsortDestroySortHandle(SSortHandle* pSortHandle) { ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册