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

Merge pull request #18531 from taosdata/refact/submit_req_wxy 

enh: insert row format
This commit is contained in:
Xiaoyu Wang 2022-11-29 08:57:33 +08:00 committed by GitHub
parent c3bb58bf27 addba6aadc
commit 562c8c99ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/tmsg.h
View File

@ -3203,6 +3203,7 @@ int32_t tSerializeSMqHbReq(void* buf, int32_t bufLen, SMqHbReq* pReq);
int32_t tDeserializeSMqHbReq(void* buf, int32_t bufLen, SMqHbReq* pReq); int32_t tDeserializeSMqHbReq(void* buf, int32_t bufLen, SMqHbReq* pReq);
typedef struct { typedef struct {
bool isColFmt;
int64_t suid; int64_t suid;
int64_t uid; int64_t uid;
int32_t sver; int32_t sver;

22
source/common/src/tmsg.c
View File

@ -6834,18 +6834,26 @@ _exit:
return code; return code;
} }
void destroySSubmitTbData(SSubmitTbData *pTbData) {
if (pTbData->isColFmt) {
// todo
} else {
taosArrayDestroyP(pTbData->aRowP, (FDelete)tRowDestroy);
}
}
void tDestroySSubmitTbData(SSubmitTbData *pTbData) { void tDestroySSubmitTbData(SSubmitTbData *pTbData) {
// todo if (NULL == pTbData) {
return;
}
destroySSubmitTbData(pTbData);
taosMemoryFree(pTbData);
} }
void tDestroySSubmitReq2(SSubmitReq2 *pReq) { void tDestroySSubmitReq2(SSubmitReq2 *pReq) {
if (NULL == pReq) return; if (NULL == pReq) return;
if (pReq->flag & SUBMIT_REQ_AUTO_CREATE_TABLE) { taosArrayDestroyEx(pReq->aCreateTbReq, (FDelete)tdDestroySVCreateTbReq);
taosArrayDestroyEx(pReq->aCreateTbReq, NULL /* todo */); taosArrayDestroyEx(pReq->aSubmitTbData, (FDelete)destroySSubmitTbData);
}
taosArrayDestroyEx(pReq->aSubmitTbData, NULL /* todo */);
taosMemoryFree(pReq); taosMemoryFree(pReq);
} }

5
source/libs/parser/src/parInsertUtil.c
View File

@ -1071,6 +1071,7 @@ void insDestroyTableDataCxt(STableDataCxt* pTableCxt) {
tdDestroySVCreateTbReq(pTableCxt->pCreateTblReq); tdDestroySVCreateTbReq(pTableCxt->pCreateTblReq);
taosMemoryFreeClear(pTableCxt->pCreateTblReq); taosMemoryFreeClear(pTableCxt->pCreateTblReq);
tDestroySSubmitTbData(pTableCxt->pData); tDestroySSubmitTbData(pTableCxt->pData);
taosMemoryFree(pTableCxt);
} }
void insDestroyVgroupDataCxt(SVgroupDataCxt* pVgCxt) { void insDestroyVgroupDataCxt(SVgroupDataCxt* pVgCxt) {
@ -1079,6 +1080,7 @@ void insDestroyVgroupDataCxt(SVgroupDataCxt* pVgCxt) {
} }
tDestroySSubmitReq2(pVgCxt->pData); tDestroySSubmitReq2(pVgCxt->pData);
taosMemoryFree(pVgCxt);
} }
void insDestroyVgroupDataCxtList(SArray* pVgCxtList) { void insDestroyVgroupDataCxtList(SArray* pVgCxtList) {
@ -1134,6 +1136,7 @@ static int32_t fillVgroupDataCxt(STableDataCxt* pTableCxt, SVgroupDataCxt* pVgCx
} }
} }
taosArrayPush(pVgCxt->pData->aCreateTbReq, pTableCxt->pCreateTblReq); taosArrayPush(pVgCxt->pData->aCreateTbReq, pTableCxt->pCreateTblReq);
taosMemoryFreeClear(pTableCxt->pCreateTblReq);
} }
if (NULL == pVgCxt->pData->aSubmitTbData) { if (NULL == pVgCxt->pData->aSubmitTbData) {
@ -1143,7 +1146,7 @@ static int32_t fillVgroupDataCxt(STableDataCxt* pTableCxt, SVgroupDataCxt* pVgCx
} }
} }
taosArrayPush(pVgCxt->pData->aSubmitTbData, pTableCxt->pData); taosArrayPush(pVgCxt->pData->aSubmitTbData, pTableCxt->pData);
pTableCxt->pData = NULL; taosMemoryFreeClear(pTableCxt->pData);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }