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

fix(tsdb/cache): prepend ts col to load stt

This commit is contained in:
Minglei Jin 2023-12-22 12:12:15 +08:00
parent 9d3eb02f3c
commit 16ad59fb18
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -885,6 +885,14 @@ static int32_t tsdbCacheLoadFromRaw(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArr
int32_t code = 0; int32_t code = 0;
rocksdb_writebatch_t *wb = NULL; rocksdb_writebatch_t *wb = NULL;
SArray *pTmpColArray = NULL; SArray *pTmpColArray = NULL;
SIdxKey *idxKey = taosArrayGet(remainCols, 0);
if (idxKey->key.cid != PRIMARYKEY_TIMESTAMP_COL_ID) {
SLastKey *key = &(SLastKey){.ltype = ltype, .uid = uid, .cid = PRIMARYKEY_TIMESTAMP_COL_ID};
taosArrayInsert(remainCols, 0, &(SIdxKey){0, *key});
}
int num_keys = TARRAY_SIZE(remainCols); int num_keys = TARRAY_SIZE(remainCols);
int16_t *aCols = taosMemoryMalloc(num_keys * sizeof(int16_t)); int16_t *aCols = taosMemoryMalloc(num_keys * sizeof(int16_t));
int16_t *slotIds = taosMemoryMalloc(num_keys * sizeof(int16_t)); int16_t *slotIds = taosMemoryMalloc(num_keys * sizeof(int16_t));
@ -1875,7 +1883,7 @@ static int32_t lastIterOpen(SFSLastIter *iter, STFileSet *pFileSet, STsdb *pTsdb
.backward = 1, .backward = 1,
.pSttFileBlockIterArray = pr->pLDataIterArray, .pSttFileBlockIterArray = pr->pLDataIterArray,
.pCols = aCols, .pCols = aCols,
.numOfCols = nCols + 1, .numOfCols = nCols,
.loadTombFn = loadSttTomb, .loadTombFn = loadSttTomb,
.pReader = pr, .pReader = pr,
.idstr = pr->idstr, .idstr = pr->idstr,