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

use new tsdbReadBlockData interface

This commit is contained in:
Minglei Jin 2022-06-25 20:46:16 +08:00
parent 9a123ba608
commit 9dd060b439
2 changed files with 7 additions and 4 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

@ -271,7 +271,7 @@ static int32_t mergeLastRowFileSet(STbDataIter *iter, STbDataIter *iiter, SDFile
tMapDataGetItemByIdx(&blockMap, iBlock, &block, tGetBlock); tMapDataGetItemByIdx(&blockMap, iBlock, &block, tGetBlock);
code = tsdbReadBlockData(pDataFReader, &blockIdx, &block, &blockData, NULL, 0, NULL, NULL); code = tsdbReadBlockData(pDataFReader, &blockIdx, &block, &blockData, NULL, NULL);
if (code) goto _err; if (code) goto _err;
int32_t nRow = blockData.nRow; int32_t nRow = blockData.nRow;
@ -311,6 +311,7 @@ _err:
return code; return code;
} }
#endif #endif
typedef enum SFSNEXTROWSTATES { typedef enum SFSNEXTROWSTATES {
SFSNEXTROW_FS, SFSNEXTROW_FS,
SFSNEXTROW_FILESET, SFSNEXTROW_FILESET,
@ -383,7 +384,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
tBlockDataReset(&state->blockData); tBlockDataReset(&state->blockData);
tMapDataGetItemByIdx(&state->blockMap, state->iBlock, &block, tGetBlock); tMapDataGetItemByIdx(&state->blockMap, state->iBlock, &block, tGetBlock);
code = tsdbReadBlockData(state->pDataFReader, &state->blockIdx, &block, &state->blockData, NULL, 0, NULL, NULL); code = tsdbReadBlockData(state->pDataFReader, &state->blockIdx, &block, &state->blockData, NULL, NULL);
if (code) goto _err; if (code) goto _err;
state->nRow = state->blockData.nRow; state->nRow = state->blockData.nRow;
@ -601,9 +602,9 @@ static int32_t mergeLastRow(tb_uid_t uid, STsdb *pTsdb, STSRow **ppRow) {
// bool deleted = tsdbKeyDeleted(maxKey, pSkyline, &iSkyline); // bool deleted = tsdbKeyDeleted(maxKey, pSkyline, &iSkyline);
if (!deleted) { if (!deleted) {
merge[nMerge++] = max[i]; merge[nMerge++] = max[i];
} else {
input[iMax[i]].next = true;
} }
input[iMax[i]].next = deleted;
} }
// merge if nMerge > 1 // merge if nMerge > 1

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

@ -61,6 +61,8 @@ static int32_t tsdbEndCommit(SCommitter *pCommitter, int32_t eno);
int32_t tsdbBegin(STsdb *pTsdb) { int32_t tsdbBegin(STsdb *pTsdb) {
int32_t code = 0; int32_t code = 0;
if (!pTsdb) return code;
code = tsdbMemTableCreate(pTsdb, &pTsdb->mem); code = tsdbMemTableCreate(pTsdb, &pTsdb->mem);
if (code) goto _err; if (code) goto _err;