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

tsdb/cache: fix compilation

This commit is contained in:
Minglei Jin 2023-07-17 09:00:17 +08:00
parent 2b21c5e0f6
commit 8263c49c17
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1723,9 +1723,9 @@ typedef struct {
static int32_t lastIterClose(SFSLastIter **iter) { static int32_t lastIterClose(SFSLastIter **iter) {
int32_t code = 0; int32_t code = 0;
if (iter->pMergeTree) { if ((*iter)->pMergeTree) {
tMergeTreeClose(iter->pMergeTree); tMergeTreeClose((*iter)->pMergeTree);
iter->pMergeTree = NULL; (*iter)->pMergeTree = NULL;
} }
*iter = NULL; *iter = NULL;
@ -1819,6 +1819,7 @@ typedef struct SFSNextRowIter {
SFSLastIter lastIter; SFSLastIter lastIter;
SFSLastIter *pLastIter; SFSLastIter *pLastIter;
TSDBROW *pLastRow; TSDBROW *pLastRow;
SCacheRowsReader *pr;
struct CacheNextRowIter *pRowIter; struct CacheNextRowIter *pRowIter;
} SFSNextRowIter; } SFSNextRowIter;
@ -1842,7 +1843,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlie
state->pFileSet = TARRAY2_GET(state->aDFileSet, state->iFileSet); state->pFileSet = TARRAY2_GET(state->aDFileSet, state->iFileSet);
} }
STFileObj **pFileObj = pFileSet->farr; STFileObj **pFileObj = state->pFileSet->farr;
if (pFileObj[0] != NULL || pFileObj[3] != NULL) { if (pFileObj[0] != NULL || pFileObj[3] != NULL) {
SDataFileReaderConfig conf = {.tsdb = state->pTsdb, .szPage = state->pTsdb->pVnode->config.szPage}; SDataFileReaderConfig conf = {.tsdb = state->pTsdb, .szPage = state->pTsdb->pVnode->config.szPage};
const char *filesName[4] = {0}; const char *filesName[4] = {0};
@ -2035,6 +2036,38 @@ _err:
return code; return code;
} }
int32_t clearNextRowFromFS(void *iter) {
int32_t code = 0;
SFSNextRowIter *state = (SFSNextRowIter *)iter;
if (!state) {
return code;
}
/*
if (state->pDataFReader) {
tsdbDataFReaderClose(&state->pDataFReader);
state->pDataFReader = NULL;
}
if (state->aBlockIdx) {
// taosArrayDestroy(state->aBlockIdx);
tsdbBICacheRelease(state->pTsdb->biCache, state->aBlockIdxHandle);
state->aBlockIdxHandle = NULL;
state->aBlockIdx = NULL;
}
if (state->pBlockData) {
// tBlockDataDestroy(&state->blockData, 1);
tBlockDataDestroy(state->pBlockData);
state->pBlockData = NULL;
}
if (state->blockMap.pData != NULL) {
tMapDataClear(&state->blockMap);
}
*/
return code;
}
#if 0 #if 0
static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlierTs, bool isLast, int16_t *aCols, static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow, bool *pIgnoreEarlierTs, bool isLast, int16_t *aCols,
int nCols) { int nCols) {
@ -2313,8 +2346,6 @@ _err:
return code; return code;
} }
#endif
int32_t clearNextRowFromFS(void *iter) { int32_t clearNextRowFromFS(void *iter) {
int32_t code = 0; int32_t code = 0;
@ -2346,6 +2377,7 @@ int32_t clearNextRowFromFS(void *iter) {
return code; return code;
} }
#endif
typedef enum SMEMNEXTROWSTATES { typedef enum SMEMNEXTROWSTATES {
SMEMNEXTROW_ENTER, SMEMNEXTROW_ENTER,
@ -2581,7 +2613,7 @@ static int32_t nextRowIterOpen(CacheNextRowIter *pIter, tb_uid_t uid, STsdb *pTs
pIter->fsState.pTSchema = pTSchema; pIter->fsState.pTSchema = pTSchema;
pIter->fsState.suid = suid; pIter->fsState.suid = suid;
pIter->fsState.uid = uid; pIter->fsState.uid = uid;
pIter->fsState.pDataFReader = pDataFReader; // pIter->fsState.pDataFReader = pDataFReader;
pIter->fsState.lastTs = lastTs; pIter->fsState.lastTs = lastTs;
pIter->input[0] = (TsdbNextRowState){&pIter->memRow, true, false, false, &pIter->memState, getNextRowFromMem, NULL}; pIter->input[0] = (TsdbNextRowState){&pIter->memRow, true, false, false, &pIter->memState, getNextRowFromMem, NULL};