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

Merge branch 'refact/submit_req' of https://github.com/taosdata/TDengine into refact/submit_req

This commit is contained in:
Hongze Cheng 2022-11-30 14:27:08 +08:00
parent 5d5e16338d 2a27c2d8f4
commit 5a3949eae8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6838,14 +6838,6 @@ void tDestroySSubmitTbData(SSubmitTbData *pTbData, int32_t flag) {
if (flag == TSDB_MSG_FLG_ENCODE) { if (flag == TSDB_MSG_FLG_ENCODE) {
if (pTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) { if (pTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
int32_t nRow = TARRAY_SIZE(pTbData->aRowP);
SRow **rows = (SRow **)TARRAY_DATA(pTbData->aRowP);
for (int32_t i = 0; i < nRow; ++i) {
tRowDestroy(rows[i]);
}
taosArrayDestroy(pTbData->aRowP);
} else {
int32_t nColData = TARRAY_SIZE(pTbData->aCol); int32_t nColData = TARRAY_SIZE(pTbData->aCol);
SColData *aColData = (SColData *)TARRAY_DATA(pTbData->aCol); SColData *aColData = (SColData *)TARRAY_DATA(pTbData->aCol);
@ -6853,6 +6845,14 @@ void tDestroySSubmitTbData(SSubmitTbData *pTbData, int32_t flag) {
tColDataDestroy(&aColData[i]); tColDataDestroy(&aColData[i]);
} }
taosArrayDestroy(pTbData->aCol); taosArrayDestroy(pTbData->aCol);
} else {
int32_t nRow = TARRAY_SIZE(pTbData->aRowP);
SRow **rows = (SRow **)TARRAY_DATA(pTbData->aRowP);
for (int32_t i = 0; i < nRow; ++i) {
tRowDestroy(rows[i]);
}
taosArrayDestroy(pTbData->aRowP);
} }
} else if (flag == TSDB_MSG_FLG_DECODE) { } else if (flag == TSDB_MSG_FLG_DECODE) {
if (pTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) { if (pTbData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {