This commit is contained in:
Hongze Cheng 2022-06-29 08:54:32 +00:00
parent c595b8cf51
commit 8e1de153dd
1 changed files with 11 additions and 7 deletions

View File

@ -1031,20 +1031,24 @@ static int32_t tColDataUpdateOffset(SColData *pColData) {
ASSERT(pColData->nVal > 0); ASSERT(pColData->nVal > 0);
ASSERT(pColData->flag); ASSERT(pColData->flag);
ASSERT(IS_VAR_DATA_TYPE(pColData->type));
if (IS_VAR_DATA_TYPE(pColData->type) && (pColData->flag & HAS_VALUE)) { if ((pColData->flag & HAS_VALUE)) {
code = tsdbRealloc((uint8_t **)&pColData->aOffset, sizeof(int32_t) * pColData->nVal); code = tsdbRealloc((uint8_t **)&pColData->aOffset, sizeof(int32_t) * pColData->nVal);
if (code) goto _exit; if (code) goto _exit;
int32_t offset = 0; int32_t offset = 0;
for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) { for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) {
uint8_t v = GET_BIT2(pColData->pBitMap, iVal); if (pColData->flag != HAS_VALUE) {
if (v == 0 || v == 1) { uint8_t v = GET_BIT2(pColData->pBitMap, iVal);
pColData->aOffset[iVal] = -1; if (v == 0 || v == 1) {
} else { pColData->aOffset[iVal] = -1;
pColData->aOffset[iVal] = offset; continue;
offset += tGetValue(pColData->pData + offset, &value, pColData->type); }
} }
pColData->aOffset[iVal] = offset;
offset += tGetValue(pColData->pData + offset, &value, pColData->type);
} }
ASSERT(offset == pColData->nData); ASSERT(offset == pColData->nData);