提交 992480eb 编写于 作者: M Minglei Jin

cache/read: fix ltype calc

上级 90be20a6
...@@ -294,7 +294,7 @@ _exit: ...@@ -294,7 +294,7 @@ _exit:
} }
int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsReader *pr, int32_t ltype) { 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]; char const *lstring = alstring[ltype];
int32_t code = 0; int32_t code = 0;
...@@ -342,7 +342,12 @@ int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsR ...@@ -342,7 +342,12 @@ int32_t tsdbCacheGet(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCacheRowsR
} }
} else { } else {
// recalc: load from tsdb // 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 // still null, then make up a null col value
pLastCol = &noneCol; pLastCol = &noneCol;
......
...@@ -285,7 +285,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32 ...@@ -285,7 +285,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32
pr->pDataFReader = NULL; pr->pDataFReader = NULL;
pr->pDataFReaderLast = 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. // retrieve the only one last row of all tables in the uid list.
if (HASTYPE(pr->type, CACHESCAN_RETRIEVE_TYPE_SINGLE)) { if (HASTYPE(pr->type, CACHESCAN_RETRIEVE_TYPE_SINGLE)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册