enh: control stt max level
This commit is contained in:
parent
880e8c1941
commit
2c9a0dbcda
|
@ -15,6 +15,8 @@
|
|||
|
||||
#include "tsdbMerge.h"
|
||||
|
||||
#define TSDB_MAX_LEVEL 6 // means max level is 7
|
||||
|
||||
typedef struct {
|
||||
STsdb *tsdb;
|
||||
TFileSetArray *fsetArr;
|
||||
|
@ -102,7 +104,53 @@ _exit:
|
|||
static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) {
|
||||
int32_t code = 0;
|
||||
int32_t lino = 0;
|
||||
SSttLvl *lvl;
|
||||
|
||||
bool hasLevelLargerThanMax = false;
|
||||
TARRAY2_FOREACH_REVERSE(merger->ctx->fset->lvlArr, lvl) {
|
||||
if (lvl->level <= TSDB_MAX_LEVEL) {
|
||||
break;
|
||||
} else if (TARRAY2_SIZE(lvl->fobjArr) > 0) {
|
||||
hasLevelLargerThanMax = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (hasLevelLargerThanMax) {
|
||||
// merge all stt files
|
||||
merger->ctx->toData = true;
|
||||
merger->ctx->level = TSDB_MAX_LEVEL;
|
||||
|
||||
TARRAY2_FOREACH(merger->ctx->fset->lvlArr, lvl) {
|
||||
int32_t numMergeFile = TARRAY2_SIZE(lvl->fobjArr);
|
||||
|
||||
for (int32_t i = 0; i < numMergeFile; ++i) {
|
||||
STFileObj *fobj = TARRAY2_GET(lvl->fobjArr, i);
|
||||
|
||||
STFileOp op = {
|
||||
.optype = TSDB_FOP_REMOVE,
|
||||
.fid = merger->ctx->fset->fid,
|
||||
.of = fobj->f[0],
|
||||
};
|
||||
code = TARRAY2_APPEND(merger->fopArr, op);
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
|
||||
SSttFileReader *reader;
|
||||
SSttFileReaderConfig config = {
|
||||
.tsdb = merger->tsdb,
|
||||
.szPage = merger->szPage,
|
||||
.file[0] = fobj->f[0],
|
||||
};
|
||||
|
||||
code = tsdbSttFileReaderOpen(fobj->fname, &config, &reader);
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
|
||||
code = TARRAY2_APPEND(merger->sttReaderArr, reader);
|
||||
TSDB_CHECK_CODE(code, lino, _exit);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// do regular merge
|
||||
merger->ctx->toData = true;
|
||||
merger->ctx->level = 0;
|
||||
|
||||
|
@ -125,17 +173,18 @@ static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) {
|
|||
|
||||
ASSERT(merger->ctx->level > 0);
|
||||
|
||||
SSttLvl *lvl;
|
||||
if (merger->ctx->level <= TSDB_MAX_LEVEL) {
|
||||
TARRAY2_FOREACH_REVERSE(merger->ctx->fset->lvlArr, lvl) {
|
||||
if (TARRAY2_SIZE(lvl->fobjArr) == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (lvl->level <= merger->ctx->level) {
|
||||
if (lvl->level >= merger->ctx->level) {
|
||||
merger->ctx->toData = false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// get number of level-0 files to merge
|
||||
int32_t numFile = pow(merger->sttTrigger, merger->ctx->level);
|
||||
|
@ -187,6 +236,11 @@ static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) {
|
|||
}
|
||||
}
|
||||
|
||||
if (merger->ctx->level > TSDB_MAX_LEVEL) {
|
||||
merger->ctx->level = TSDB_MAX_LEVEL;
|
||||
}
|
||||
}
|
||||
|
||||
_exit:
|
||||
if (code) {
|
||||
TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
|
||||
|
|
Loading…
Reference in New Issue