diff --git a/source/dnode/vnode/src/tsdb/tsdbCache.c b/source/dnode/vnode/src/tsdb/tsdbCache.c index 7237b5002c..d1488fa0b6 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCache.c +++ b/source/dnode/vnode/src/tsdb/tsdbCache.c @@ -376,7 +376,7 @@ static SLastCol *tsdbCacheDeserialize(char const *value, size_t size) { return NULL; } - SLastCol* pLastCol = taosMemoryCalloc(1, sizeof(SLastCol)); + SLastCol *pLastCol = taosMemoryCalloc(1, sizeof(SLastCol)); if (NULL == pLastCol) { return NULL; } @@ -1082,8 +1082,8 @@ static int32_t tsdbCacheUpdate(STsdb *pTsdb, tb_uid_t suid, tb_uid_t uid, SArray } if (NULL == pLastCol || cmp_res < 0 || (cmp_res == 0 && !COL_VAL_IS_NONE(pColVal))) { - char *value = NULL; - size_t vlen = 0; + char *value = NULL; + size_t vlen = 0; SLastCol lastColTmp = {.rowKey = *pRowKey, .colVal = *pColVal}; tsdbCacheSerialize(&lastColTmp, &value, &vlen); @@ -1558,7 +1558,10 @@ static int32_t tsdbCacheLoadFromRaw(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArr taosArraySet(pLastArray, idxKey->idx, pLastCol); // taosArrayRemove(remainCols, i); - if (!pTmpColArray) { + if (/*!pTmpColArray*/ lastTmpIndexArray && !lastTmpColArray) { + continue; + } + if (/*!pTmpColArray*/ lastrowTmpIndexArray && lastrowTmpColArray) { continue; }