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

fix mem leak

This commit is contained in:
54liuyao 2024-08-06 19:36:39 +08:00
parent cce942d04d
commit 372c0f21f2
18 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/libs/executor/src/aggregateoperator.c
View File

@ -147,12 +147,7 @@ _error:
if (pInfo != NULL) { if (pInfo != NULL) {
destroyAggOperatorInfo(pInfo); destroyAggOperatorInfo(pInfo);
} }
destroyOperator(pOperator);
if (pOperator != NULL) {
cleanupExprSupp(&pOperator->exprSupp);
}
taosMemoryFreeClear(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

2
source/libs/executor/src/cachescanoperator.c
View File

@ -247,7 +247,7 @@ _error:
} }
pInfo->pTableList = NULL; pInfo->pTableList = NULL;
destroyCacheScanOperator(pInfo); destroyCacheScanOperator(pInfo);
taosMemoryFree(pOperator); destroyOperator(pOperator);
return code; return code;
} }

2
source/libs/executor/src/countwindowoperator.c
View File

@ -341,7 +341,7 @@ _error:
destroyCountWindowOperatorInfo(pInfo); destroyCountWindowOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

2
source/libs/executor/src/eventwindowoperator.c
View File

@ -145,7 +145,7 @@ _error:
destroyEWindowOperatorInfo(pInfo); destroyEWindowOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

2
source/libs/executor/src/exchangeoperator.c
View File

@ -443,7 +443,7 @@ _error:
doDestroyExchangeOperatorInfo(pInfo); doDestroyExchangeOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

2
source/libs/executor/src/filloperator.c
View File

@ -567,7 +567,7 @@ _error:
} }
pTaskInfo->code = code; pTaskInfo->code = code;
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
return code; return code;
} }

2
source/libs/executor/src/groupcacheoperator.c
View File

@ -1504,7 +1504,7 @@ _error:
destroyGroupCacheOperator(pInfo); destroyGroupCacheOperator(pInfo);
} }
taosMemoryFree(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

6
source/libs/executor/src/groupoperator.c
View File

@ -1242,7 +1242,7 @@ _error:
destroyPartitionOperatorInfo(pInfo); destroyPartitionOperatorInfo(pInfo);
} }
pTaskInfo->code = code; pTaskInfo->code = code;
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
TAOS_RETURN(code); TAOS_RETURN(code);
} }
@ -1784,8 +1784,8 @@ int32_t createStreamPartitionOperatorInfo(SOperatorInfo* downstream, SStreamPart
_error: _error:
pTaskInfo->code = code; pTaskInfo->code = code;
destroyStreamPartitionOperatorInfo(pInfo); if (pInfo != NULL) destroyStreamPartitionOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
return code; return code;
} }

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

@ -180,7 +180,7 @@ int32_t createProjectOperatorInfo(SOperatorInfo* downstream, SProjectPhysiNode*
_error: _error:
destroyProjectOperatorInfo(pInfo); destroyProjectOperatorInfo(pInfo);
taosMemoryFree(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -529,7 +529,7 @@ int32_t createIndefinitOutputOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
_error: _error:
destroyIndefinitOperatorInfo(pInfo); destroyIndefinitOperatorInfo(pInfo);
taosMemoryFree(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

14
source/libs/executor/src/scanoperator.c
View File

@ -1432,7 +1432,7 @@ _error:
destroyTableScanOperatorInfo(pInfo); destroyTableScanOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -4113,7 +4113,7 @@ _error:
destroyStreamScanOperatorInfo(pInfo); destroyStreamScanOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -4669,8 +4669,8 @@ _error:
pInfo->pTableListInfo = NULL; pInfo->pTableListInfo = NULL;
} }
taosMemoryFree(pInfo); if (pInfo != NULL) destroyTagScanOperatorInfo(pInfo);
taosMemoryFree(pOperator); destroyOperator(pOperator);
return code; return code;
} }
@ -5914,8 +5914,8 @@ int32_t createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanNode, SR
_error: _error:
pTaskInfo->code = code; pTaskInfo->code = code;
pInfo->base.pTableListInfo = NULL; pInfo->base.pTableListInfo = NULL;
taosMemoryFree(pInfo); if (pInfo != NULL) destroyTableMergeScanOperatorInfo(pInfo);
taosMemoryFree(pOperator); destroyOperator(pOperator);
return code; return code;
} }
@ -6072,7 +6072,7 @@ _error:
if (pInfo != NULL) { if (pInfo != NULL) {
destoryTableCountScanOperator(pInfo); destoryTableCountScanOperator(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

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

@ -164,7 +164,7 @@ _error:
destroySortOperatorInfo(pInfo); destroySortOperatorInfo(pInfo);
} }
taosMemoryFree(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -824,6 +824,6 @@ _error:
if (pInfo != NULL) { if (pInfo != NULL) {
destroyGroupSortOperatorInfo(pInfo); destroyGroupSortOperatorInfo(pInfo);
} }
taosMemoryFree(pOperator); destroyOperator(pOperator);
return code; return code;
} }

2
source/libs/executor/src/streamcountwindowoperator.c
View File

@ -926,7 +926,7 @@ _error:
destroyStreamCountAggOperatorInfo(pInfo); destroyStreamCountAggOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
return code; return code;

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

@ -980,8 +980,8 @@ int32_t createStreamEventAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
return code; return code;
_error: _error:
destroyStreamEventOperatorInfo(pInfo); if (pInfo != NULL) destroyStreamEventOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
return code; return code;

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

@ -1458,8 +1458,8 @@ _error:
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
qError("%s failed at line %d since %s. task:%s", __func__, lino, tstrerror(code), GET_TASKID(pTaskInfo)); qError("%s failed at line %d since %s. task:%s", __func__, lino, tstrerror(code), GET_TASKID(pTaskInfo));
} }
destroyStreamFillOperatorInfo(pInfo); if (pInfo != NULL) destroyStreamFillOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

16
source/libs/executor/src/streamtimewindowoperator.c
View File

@ -2012,8 +2012,8 @@ int32_t createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, SPhysiN
return code; return code;
_error: _error:
destroyStreamFinalIntervalOperatorInfo(pInfo); if (pInfo != NULL) destroyStreamFinalIntervalOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -3832,7 +3832,7 @@ _error:
destroyStreamSessionAggOperatorInfo(pInfo); destroyStreamSessionAggOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
return code; return code;
@ -4088,7 +4088,7 @@ _error:
if (pInfo != NULL) { if (pInfo != NULL) {
destroyStreamSessionAggOperatorInfo(pInfo); destroyStreamSessionAggOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
qError("%s failed at line %d since %s. task:%s", __func__, lino, tstrerror(code), GET_TASKID(pTaskInfo)); qError("%s failed at line %d since %s. task:%s", __func__, lino, tstrerror(code), GET_TASKID(pTaskInfo));
@ -4977,8 +4977,8 @@ int32_t createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
return code; return code;
_error: _error:
destroyStreamStateOperatorInfo(pInfo); if (pInfo != NULL) destroyStreamStateOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
return code; return code;
@ -5312,8 +5312,8 @@ int32_t createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhysiNode*
return code; return code;
_error: _error:
destroyStreamFinalIntervalOperatorInfo(pInfo); if (pInfo != NULL) destroyStreamFinalIntervalOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

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

@ -2813,8 +2813,8 @@ int32_t createDataBlockInfoScanOperator(SReadHandle* readHandle, SBlockDistScanP
_error: _error:
if (pInfo) { if (pInfo) {
pInfo->pTableListInfo = NULL; pInfo->pTableListInfo = NULL;
destroyBlockDistScanOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pInfo); destroyOperator(pOperator);
taosMemoryFreeClear(pOperator);
return code; return code;
} }

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

@ -1207,8 +1207,8 @@ _error:
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
qError("%s failed at line %d since %s", __func__, lino, tstrerror(code)); qError("%s failed at line %d since %s", __func__, lino, tstrerror(code));
} }
taosMemoryFree(pInfo); if (pInfo != NULL) destroyTimeSliceOperatorInfo(pInfo);
taosMemoryFree(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }

12
source/libs/executor/src/timewindowoperator.c
View File

@ -1402,7 +1402,7 @@ _error:
if (pInfo != NULL) { if (pInfo != NULL) {
destroyIntervalOperatorInfo(pInfo); destroyIntervalOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -1678,7 +1678,7 @@ _error:
destroyStateWindowOperatorInfo(pInfo); destroyStateWindowOperatorInfo(pInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -1770,8 +1770,8 @@ int32_t createSessionAggOperatorInfo(SOperatorInfo* downstream, SSessionWinodwPh
return code; return code;
_error: _error:
destroySWindowOperatorInfo(pInfo); if (pInfo != NULL) destroySWindowOperatorInfo(pInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -2083,7 +2083,7 @@ int32_t createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, SMerge
_error: _error:
destroyMAIOperatorInfo(miaInfo); destroyMAIOperatorInfo(miaInfo);
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }
@ -2415,7 +2415,7 @@ _error:
destroyMergeIntervalOperatorInfo(pMergeIntervalInfo); destroyMergeIntervalOperatorInfo(pMergeIntervalInfo);
} }
taosMemoryFreeClear(pOperator); destroyOperator(pOperator);
pTaskInfo->code = code; pTaskInfo->code = code;
return code; return code;
} }