use tDeleteSVCreateTbBatchReq free mem
This commit is contained in:
parent
129d04a449
commit
e0167511c1
|
@ -440,14 +440,7 @@ static cJSON* processCreateTable(SMqMetaRsp* metaRsp) {
|
||||||
|
|
||||||
_exit:
|
_exit:
|
||||||
uDebug("create table return, sql json:%s", cJSON_PrintUnformatted(pJson));
|
uDebug("create table return, sql json:%s", cJSON_PrintUnformatted(pJson));
|
||||||
for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
|
tDeleteSVCreateTbBatchReq(&req);
|
||||||
pCreateReq = req.pReqs + iReq;
|
|
||||||
taosMemoryFreeClear(pCreateReq->comment);
|
|
||||||
taosMemoryFreeClear(pCreateReq->sql);
|
|
||||||
if (pCreateReq->type == TSDB_CHILD_TABLE) {
|
|
||||||
taosArrayDestroy(pCreateReq->ctb.tagName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tDecoderClear(&decoder);
|
tDecoderClear(&decoder);
|
||||||
return pJson;
|
return pJson;
|
||||||
}
|
}
|
||||||
|
@ -1110,13 +1103,7 @@ static int32_t taosCreateTable(TAOS* taos, void* meta, int32_t metaLen) {
|
||||||
|
|
||||||
end:
|
end:
|
||||||
uDebug(LOG_ID_TAG " create table return, msg:%s", LOG_ID_VALUE, tstrerror(code));
|
uDebug(LOG_ID_TAG " create table return, msg:%s", LOG_ID_VALUE, tstrerror(code));
|
||||||
for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
|
tDeleteSVCreateTbBatchReq(&req);
|
||||||
pCreateReq = req.pReqs + iReq;
|
|
||||||
taosMemoryFreeClear(pCreateReq->comment);
|
|
||||||
if (pCreateReq->type == TSDB_CHILD_TABLE) {
|
|
||||||
taosArrayDestroy(pCreateReq->ctb.tagName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
taosHashCleanup(pVgroupHashmap);
|
taosHashCleanup(pVgroupHashmap);
|
||||||
destroyRequest(pRequest);
|
destroyRequest(pRequest);
|
||||||
|
|
|
@ -8369,11 +8369,14 @@ int tDecodeSVCreateTbBatchReq(SDecoder *pCoder, SVCreateTbBatchReq *pReq) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void tDeleteSVCreateTbBatchReq(SVCreateTbBatchReq* pReq) {
|
void tDeleteSVCreateTbBatchReq(SVCreateTbBatchReq *pReq) {
|
||||||
for (int32_t iReq = 0; iReq < pReq->nReqs; iReq++) {
|
for (int32_t iReq = 0; iReq < pReq->nReqs; iReq++) {
|
||||||
SVCreateTbReq* pCreateReq = pReq->pReqs + iReq;
|
SVCreateTbReq *pCreateReq = pReq->pReqs + iReq;
|
||||||
|
taosMemoryFreeClear(pCreateReq->sql);
|
||||||
|
taosMemoryFreeClear(pCreateReq->comment);
|
||||||
if (pCreateReq->type == TSDB_CHILD_TABLE) {
|
if (pCreateReq->type == TSDB_CHILD_TABLE) {
|
||||||
taosArrayDestroy(pCreateReq->ctb.tagName);
|
taosArrayDestroy(pCreateReq->ctb.tagName);
|
||||||
|
pCreateReq->ctb.tagName = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,14 +99,7 @@ bool isValValidForTable(STqHandle* pHandle, SWalCont* pHead) {
|
||||||
taosArrayDestroy(reqNew.pArray);
|
taosArrayDestroy(reqNew.pArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
|
tDeleteSVCreateTbBatchReq(&req);
|
||||||
pCreateReq = req.pReqs + iReq;
|
|
||||||
taosMemoryFreeClear(pCreateReq->comment);
|
|
||||||
taosMemoryFreeClear(pCreateReq->sql);
|
|
||||||
if (pCreateReq->type == TSDB_CHILD_TABLE) {
|
|
||||||
taosArrayDestroy(pCreateReq->ctb.tagName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (msgType == TDMT_VND_ALTER_TABLE) {
|
} else if (msgType == TDMT_VND_ALTER_TABLE) {
|
||||||
SVAlterTbReq req = {0};
|
SVAlterTbReq req = {0};
|
||||||
|
|
||||||
|
|
|
@ -1158,12 +1158,7 @@ static int32_t vnodeProcessCreateTbReq(SVnode *pVnode, int64_t ver, void *pReq,
|
||||||
}
|
}
|
||||||
|
|
||||||
_exit:
|
_exit:
|
||||||
for (int32_t iReq = 0; iReq < req.nReqs; iReq++) {
|
tDeleteSVCreateTbBatchReq(&req);
|
||||||
pCreateReq = req.pReqs + iReq;
|
|
||||||
taosMemoryFree(pCreateReq->sql);
|
|
||||||
taosMemoryFree(pCreateReq->comment);
|
|
||||||
taosArrayDestroy(pCreateReq->ctb.tagName);
|
|
||||||
}
|
|
||||||
taosArrayDestroyEx(rsp.pArray, tFreeSVCreateTbRsp);
|
taosArrayDestroyEx(rsp.pArray, tFreeSVCreateTbRsp);
|
||||||
taosArrayDestroy(tbUids);
|
taosArrayDestroy(tbUids);
|
||||||
tDecoderClear(&decoder);
|
tDecoderClear(&decoder);
|
||||||
|
|
Loading…
Reference in New Issue