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

fix: coldata set val

This commit is contained in:
xsren 2024-10-29 19:50:21 +08:00
parent 36e115d2cd
commit 694e757770
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,16 @@ int32_t getJsonValueLen(const char* data) {
return dataLen; return dataLen;
} }
static int32_t getDataLen(int32_t type, const char* pData) {
int32_t dataLen = 0;
if (type == TSDB_DATA_TYPE_JSON) {
dataLen = getJsonValueLen(pData);
} else {
dataLen = varDataTLen(pData);
}
return dataLen;
}
int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, bool isNull) { int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, bool isNull) {
if (isNull || pData == NULL) { if (isNull || pData == NULL) {
// There is a placehold for each NULL value of binary or nchar type. // There is a placehold for each NULL value of binary or nchar type.
@ -102,19 +112,18 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const
int32_t type = pColumnInfoData->info.type; int32_t type = pColumnInfoData->info.type;
if (IS_VAR_DATA_TYPE(type)) { if (IS_VAR_DATA_TYPE(type)) {
int32_t dataLen = 0; int32_t dataLen = getDataLen(type, pData);
if (type == TSDB_DATA_TYPE_JSON) { if (pColumnInfoData->varmeta.offset[rowIndex] > 0) {
dataLen = getJsonValueLen(pData); if (rowIndex == 0) {
pColumnInfoData->varmeta.length = 0;
} else { } else {
dataLen = varDataTLen(pData); 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;
} }
if(rowIndex == 0 && pColumnInfoData->varmeta.length > 0) {
return 0;
} }
if (pColumnInfoData->varmeta.offset[rowIndex] > 0 &&
pColumnInfoData->varmeta.offset[rowIndex] < pColumnInfoData->varmeta.length) {
return 0;
} }
SVarColAttr* pAttr = &pColumnInfoData->varmeta; SVarColAttr* pAttr = &pColumnInfoData->varmeta;