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

Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact

This commit is contained in:
Minglei Jin 2022-06-29 16:55:04 +08:00
parent 8218febeae 8e1de153dd
commit 7678b6bb7d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -1031,21 +1031,25 @@ 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++) {
if (pColData->flag != HAS_VALUE) {
uint8_t v = GET_BIT2(pColData->pBitMap, iVal); uint8_t v = GET_BIT2(pColData->pBitMap, iVal);
if (v == 0 || v == 1) { if (v == 0 || v == 1) {
pColData->aOffset[iVal] = -1; pColData->aOffset[iVal] = -1;
} else { continue;
}
}
pColData->aOffset[iVal] = offset; pColData->aOffset[iVal] = offset;
offset += tGetValue(pColData->pData + offset, &value, pColData->type); offset += tGetValue(pColData->pData + offset, &value, pColData->type);
} }
}
ASSERT(offset == pColData->nData); ASSERT(offset == pColData->nData);
pColData->offsetValid = 1; pColData->offsetValid = 1;