Skip to content

T
TDengine

taosdata / TDengine
接近 2 年 前同步成功

通知 1191
Star 22018
Fork 4786
T
TDengine
提交 724e7bc3 编写于 作者: M Minglei Jin
浏览文件
操作

fix(tsdb/cache): use state's tsdb instead of readers

上级 e5dfaf2d
隐藏空白更改
内联 并排
Showing with 5 addition and 6 deletion
source/dnode/vnode/src/tsdb/tsdbCache.c
浏览文件 @ 724e7bc3
...@@ -779,12 +779,11 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) { ...@@ -779,12 +779,11 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
code = tsdbReadBlockIdx(*state->pDataFReader, state->aBlockIdx); code = tsdbReadBlockIdx(*state->pDataFReader, state->aBlockIdx);
if (code) goto _err; if (code) goto _err;
*/ */
int32_t code = int32_t code = tsdbCacheGetBlockIdx(state->pTsdb->biCache, *state->pDataFReader, &state->aBlockIdxHandle);
tsdbCacheGetBlockIdx((*state->pDataFReader)->pTsdb->biCache, *state->pDataFReader, &state->aBlockIdxHandle);
if (code != TSDB_CODE_SUCCESS || state->aBlockIdxHandle == NULL) { if (code != TSDB_CODE_SUCCESS || state->aBlockIdxHandle == NULL) {
goto _err; goto _err;
} }
state->aBlockIdx = (SArray *)taosLRUCacheValue((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle); state->aBlockIdx = (SArray *)taosLRUCacheValue(state->pTsdb->biCache, state->aBlockIdxHandle);
/* if (state->pBlockIdx) { */ /* if (state->pBlockIdx) { */
/* } */ /* } */
...@@ -855,7 +854,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) { ...@@ -855,7 +854,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
if (state->aBlockIdx) { if (state->aBlockIdx) {
// taosArrayDestroy(state->aBlockIdx); // taosArrayDestroy(state->aBlockIdx);
tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle); tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
state->aBlockIdxHandle = NULL; state->aBlockIdxHandle = NULL;
state->aBlockIdx = NULL; state->aBlockIdx = NULL;
...@@ -881,7 +880,7 @@ _err: ...@@ -881,7 +880,7 @@ _err:
}*/ }*/
if (state->aBlockIdx) { if (state->aBlockIdx) {
// taosArrayDestroy(state->aBlockIdx); // taosArrayDestroy(state->aBlockIdx);
tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle); tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
state->aBlockIdxHandle = NULL; state->aBlockIdxHandle = NULL;
state->aBlockIdx = NULL; state->aBlockIdx = NULL;
...@@ -910,7 +909,7 @@ int32_t clearNextRowFromFS(void *iter) { ...@@ -910,7 +909,7 @@ int32_t clearNextRowFromFS(void *iter) {
}*/ }*/
if (state->aBlockIdx) { if (state->aBlockIdx) {
// taosArrayDestroy(state->aBlockIdx); // taosArrayDestroy(state->aBlockIdx);
tsdbBICacheRelease((*state->pDataFReader)->pTsdb->biCache, state->aBlockIdxHandle); tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
state->aBlockIdxHandle = NULL; state->aBlockIdxHandle = NULL;
state->aBlockIdx = NULL; state->aBlockIdx = NULL;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或