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:
Liu Jicong 2022-01-28 19:29:18 +08:00
parent ee783080f3
commit 5aa0f80c91
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/common/common.h
View File

@ -188,7 +188,7 @@ static FORCE_INLINE void tDeleteSSDataBlock(SSDataBlock* pBlock) {
taosArrayDestroy(pBlock->pDataBlock); taosArrayDestroy(pBlock->pDataBlock);
tfree(pBlock->pBlockAgg); tfree(pBlock->pBlockAgg);
tfree(pBlock); //tfree(pBlock);
} }
@ -199,10 +199,12 @@ static FORCE_INLINE void tDeleteSMqConsumeRsp(SMqConsumeRsp* pRsp) {
} }
free(pRsp->schemas); free(pRsp->schemas);
} }
for (int i = 0; i < taosArrayGetSize(pRsp->pBlockData); i++) { taosArrayDestroyEx(pRsp->pBlockData, (void(*)(void*))tDeleteSSDataBlock);
SSDataBlock* pDataBlock = (SSDataBlock*)taosArrayGet(pRsp->pBlockData, i); pRsp->pBlockData = NULL;
tDeleteSSDataBlock(pDataBlock); //for (int i = 0; i < taosArrayGetSize(pRsp->pBlockData); i++) {
} //SSDataBlock* pDataBlock = (SSDataBlock*)taosArrayGet(pRsp->pBlockData, i);
//tDeleteSSDataBlock(pDataBlock);
//}
} }
//====================================================================================================================== //======================================================================================================================

12
source/dnode/vnode/src/tq/tq.c
View File

@ -786,11 +786,13 @@ int32_t tqProcessConsumeReq(STQ* pTq, SRpcMsg* pMsg) {
void* abuf = buf; void* abuf = buf;
tEncodeSMqConsumeRsp(&abuf, &rsp); tEncodeSMqConsumeRsp(&abuf, &rsp);
if (rsp.pBlockData) { if (rsp.pBlockData) {
for (int i = 0; i < taosArrayGetSize(rsp.pBlockData); i++) { taosArrayDestroyEx(rsp.pBlockData, (void(*)(void*))tDeleteSSDataBlock);
SSDataBlock* pBlock = taosArrayGet(rsp.pBlockData, i); rsp.pBlockData = NULL;
tDeleteSSDataBlock(pBlock); /*for (int i = 0; i < taosArrayGetSize(rsp.pBlockData); i++) {*/
} /*SSDataBlock* pBlock = taosArrayGet(rsp.pBlockData, i);*/
free(rsp.pBlockData); /*tDeleteSSDataBlock(pBlock);*/
/*}*/
/*taosArrayDestroy(rsp.pBlockData);*/
} }
pMsg->pCont = buf; pMsg->pCont = buf;
pMsg->contLen = tlen; pMsg->contLen = tlen;