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

more code

This commit is contained in:
Hongze Cheng 2022-12-26 13:28:23 +08:00
parent b000fb09ba
commit d15453eb4e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ typedef struct {
SDataFReader *pReader; SDataFReader *pReader;
SDFileSet *pDFileSet; SDFileSet *pDFileSet;
SRBTree rtree; SRBTree rtree;
SBlockData bData;
} STsdbCompactor; } STsdbCompactor;
#define TSDB_FLG_DEEP_COMPACT 0x1 #define TSDB_FLG_DEEP_COMPACT 0x1
@ -333,6 +334,14 @@ int32_t tsdbCompact(STsdb *pTsdb, int32_t flag) {
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
if (pRow == NULL) break; if (pRow == NULL) break;
// code = tBlockDataAppendRow(&compactor.bData, pRow, pRow, NULL, 0);
// TSDB_CHECK_CODE(code, lino, _exit);
// if (compactor.bData.nRows >= TSDB_MAX_ROWS_PER_BLOCK) {
// code = tsdbFlushBlock(&compactor);
// TSDB_CHECK_CODE(code, lino, _exit);
// }
} }
} }

2
source/dnode/vnode/src/vnd/vnodeCommit.c
View File

@ -184,7 +184,7 @@ _err:
return -1; return -1;
} }
static int32_t vnodePrepareCommit(SVnode *pVnode) { int32_t vnodePrepareCommit(SVnode *pVnode) {
int32_t code = 0; int32_t code = 0;
tsem_wait(&pVnode->canCommit); tsem_wait(&pVnode->canCommit);