提交 d15453eb 编写于 作者: H Hongze Cheng

more code

上级 b000fb09
...@@ -52,6 +52,7 @@ typedef struct { ...@@ -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) { ...@@ -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);
// }
} }
} }
......
...@@ -184,7 +184,7 @@ _err: ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册