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

fix col clone and release problem

This commit is contained in:
pengrongkun94@qq.com 2025-01-16 21:29:43 +08:00
parent e362a045c0
commit 3b741a26fa
4 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/tdataformat.h
View File

@ -131,6 +131,7 @@ int32_t tValueCompare(const SValue *tv1, const SValue *tv2);
int32_t tRowBuild(SArray *aColVal, const STSchema *pTSchema, SRow **ppRow);
int32_t tRowGet(SRow *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);
void tRowDestroy(SRow *pRow);
void tRowDataClear(SRow *pColData);
int32_t tRowSort(SArray *aRowP);
int32_t tRowMerge(SArray *aRowP, STSchema *pTSchema, int8_t flag);
int32_t tRowUpsertColData(SRow *pRow, STSchema *pTSchema, SColData *aColData, int32_t nColData, int32_t flag);

7
source/client/src/clientStmt2.c
View File

@ -1411,10 +1411,13 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
if (pStmt->sql.stbInterlaceMode) {
(*pDataBlock)->pData->flags = 0;
code = qBindStmtStbColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf,
pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo,
pStmt->taos->optionInfo.charsetCxt);
} else {
taosArrayDestroy(pCols);
(*pDataBlock)->pData->aCol = taosArrayInit(bind->num, POINTER_BYTES);
code =
qBindStmtColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
qBindStmtColsValue2(*pDataBlock, (*pDataBlock)->pData->aRowP, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
&pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
}

9
source/common/src/tdataformat.c
View File

@ -669,6 +669,15 @@ void tRowDestroy(SRow *pRow) {
if (pRow) taosMemoryFree(pRow);
}
void tRowDataClear(SRow *pColData) {
pColData->ts = 0;
pColData->len = 0;
pColData->sver = 0;
pColData->flag = 0;
pColData->numOfPKs = 0;
}
static int32_t tRowPCmprFn(const void *p1, const void *p2) {
SRowKey key1, key2;
tRowGetKey(*(SRow **)p1, &key1);

56
source/libs/parser/src/parInsertStmt.c
View File

@ -54,8 +54,13 @@ int32_t qCloneCurrentTbData(STableDataCxt* pDataBlock, SSubmitTbData** pData) {
int32_t colNum = taosArrayGetSize(pNew->aCol);
for (int32_t i = 0; i < colNum; ++i) {
SColData* pCol = (SColData*)taosArrayGet(pNew->aCol, i);
tColDataDeepClear(pCol);
if (pDataBlock->pData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
SColData* pCol = (SColData*)taosArrayGet(pNew->aCol, i);
tColDataDeepClear(pCol);
} else {
SRow* pRowp = (SRow*)taosArrayGet(pNew->aCol, i);
tRowDataClear(pRowp);
}
}
return TSDB_CODE_SUCCESS;
@ -841,12 +846,6 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
lastColId = pColSchema->colId;
}
SColData* pCol = taosArrayGet(pCols, c);
if (pCol == NULL || pColSchema == NULL) {
code = buildInvalidOperationMsg(&pBuf, "get column schema or column data failed");
goto _return;
}
if (bind[c].num != rowNum) {
code = buildInvalidOperationMsg(&pBuf, "row number in each bind param should be the same");
goto _return;
@ -863,7 +862,7 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
if (code) {
goto _return;
}
pBind = &ncharBind;
pBindInfos[c].bind = &ncharBind;
} else {
pBindInfos[c].bind = bind + c;
}
@ -872,14 +871,14 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
pBindInfos[c].type = pColSchema->type;
pBindInfos[c].bytes = pColSchema->bytes;
// code = tColDataAddValueByBind2(pCol, pBind,
// IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
// initCtxAsText, checkWKB);
if (code) {
goto _return;
if (code) {
goto _return;
}
}
}
code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered, &pDataBlock->duplicateTs);
pDataBlock->pData->flags &= ~SUBMIT_REQ_COLUMN_DATA_FORMAT;
code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered,
&pDataBlock->duplicateTs);
qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum);
_return:
@ -1127,15 +1126,24 @@ int32_t qResetStmtDataBlock(STableDataCxt* block, bool deepClear) {
int32_t colNum = taosArrayGetSize(pBlock->pData->aCol);
for (int32_t i = 0; i < colNum; ++i) {
SColData* pCol = (SColData*)taosArrayGet(pBlock->pData->aCol, i);
if (pCol == NULL) {
qError("qResetStmtDataBlock column is NULL");
return terrno;
}
if (deepClear) {
tColDataDeepClear(pCol);
if (pBlock->pData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
SColData* pCol = (SColData*)taosArrayGet(pBlock->pData->aCol, i);
if (pCol == NULL) {
qError("qResetStmtDataBlock column is NULL");
return terrno;
}
if (deepClear) {
tColDataDeepClear(pCol);
} else {
tColDataClear(pCol);
}
} else {
tColDataClear(pCol);
SRow* aRowP = (SRow*)taosArrayGet(pBlock->pData->aRowP, i);
if (aRowP == NULL) {
qError("qResetStmtDataBlock row pointer is NULL");
return terrno;
}
tRowDataClear(aRowP);
}
}