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

fix: reset offset when trimdatablock

This commit is contained in:
xsren 2024-10-31 11:16:39 +08:00
parent 73be7ddbc6
commit ad83a9a650
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/common/src/tdatablock.c
View File

@ -114,16 +114,7 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const
if (IS_VAR_DATA_TYPE(type)) { if (IS_VAR_DATA_TYPE(type)) {
int32_t dataLen = getDataLen(type, pData); int32_t dataLen = getDataLen(type, pData);
if (pColumnInfoData->varmeta.offset[rowIndex] > 0) { if (pColumnInfoData->varmeta.offset[rowIndex] > 0) {
if (rowIndex == 0) { pColumnInfoData->varmeta.length = pColumnInfoData->varmeta.offset[rowIndex];
pColumnInfoData->varmeta.length = 0;
} else {
int32_t start = pColumnInfoData->varmeta.offset[rowIndex - 1];
int32_t lastDataLen = getDataLen(type, pColumnInfoData->pData + start);
if (start + lastDataLen < pColumnInfoData->varmeta.length) {
uInfo("column data is reassigned, row:%d, offset:%d, length:%d", rowIndex, start, lastDataLen);
pColumnInfoData->varmeta.length = start + lastDataLen;
}
}
} }
SVarColAttr* pAttr = &pColumnInfoData->varmeta; SVarColAttr* pAttr = &pColumnInfoData->varmeta;
@ -3391,6 +3382,7 @@ int32_t trimDataBlock(SSDataBlock* pBlock, int32_t totalRows, const bool* pBoolL
} }
memcpy(p2, p1, len); memcpy(p2, p1, len);
pDst->varmeta.offset[numOfRows] = -1;
code = colDataSetVal(pDst, numOfRows, p2, false); code = colDataSetVal(pDst, numOfRows, p2, false);
taosMemoryFree(p2); taosMemoryFree(p2);
if (code) { if (code) {