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

cache/read: fix ltype calc

This commit is contained in:
Minglei Jin 2023-05-05 10:22:59 +08:00
parent 90be20a662
commit 992480eb00
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,7 @@ _exit:
}
int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsReader *pr, int32_t ltype) {
static char const *alstring[2] = {"last", "last_row"};
static char const *alstring[2] = {"last_row", "last"};
char const *lstring = alstring[ltype];
int32_t code = 0;
@ -342,7 +342,12 @@ int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsR
}
} else {
// recalc: load from tsdb
if (ltype) {
SArray *pArray = NULL;
// mergeLastCid(uid, pTsdb, &pArray, pr, cid);
} else {
// mergeLastRowCid(uid, pTsdb, &pArray, pr, cid);
}
// still null, then make up a null col value
pLastCol = &noneCol;

2
source/dnode/vnode/src/tsdb/tsdbCacheRead.c
View File

@ -285,7 +285,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32
pr->pDataFReader = NULL;
pr->pDataFReaderLast = NULL;
int32_t ltype = pr->type & CACHESCAN_RETRIEVE_LAST >> 3;
int32_t ltype = (pr->type & CACHESCAN_RETRIEVE_LAST) >> 3;
// retrieve the only one last row of all tables in the uid list.
if (HASTYPE(pr->type, CACHESCAN_RETRIEVE_TYPE_SINGLE)) {