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 2023-05-18 17:08:46 +08:00
parent c7d1c88fbc
commit a622a1065a
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,7 @@ static int32_t open_committer(STsdb *pTsdb, SCommitInfo *pInfo, SCommitter *pCom
pCommitter->minRow = pInfo->info.config.tsdbCfg.minRows;
pCommitter->maxRow = pInfo->info.config.tsdbCfg.maxRows;
pCommitter->cmprAlg = pInfo->info.config.tsdbCfg.compression;
pCommitter->sttTrigger = 2; // TODO
pCommitter->sttTrigger = 1; // TODO
pCommitter->aTbDataP = tsdbMemTableGetTbDataArray(pTsdb->imem);
pCommitter->aFileOp = taosArrayInit(16, sizeof(STFileOp));

24
source/dnode/vnode/src/tsdb/dev/tsdbFS.c
View File

@ -240,6 +240,14 @@ _exit:
return code;
}
static bool is_same_file(const STFile *f1, const STFile f2) {
if (f1->type != f2.type) return false;
if (f1->did.level != f2.did.level) return false;
if (f1->did.id != f2.did.id) return false;
if (f1->cid != f2.cid) return false;
return true;
}
static int32_t apply_commit_add_fset(STFileSystem *fs, const STFileSet *fset) {
int32_t idx = taosArraySearchIdx(fs->cstate, fset, (__compar_fn_t)tsdbFSetCmprFn, TD_GT);
if (idx < 0) idx = taosArrayGetSize(fs->cstate);
@ -258,6 +266,22 @@ static int32_t apply_commit_del_fset(STFileSystem *fs, const STFileSet *fset) {
return 0;
}
static int32_t apply_commit_upd_fset(STFileSystem *fs, STFileSet *fset_from, const STFileSet *fset_to) {
for (tsdb_ftype_t ftype = TSDB_FTYPE_HEAD; ftype < TSDB_FTYPE_MAX; ++ftype) {
STFileObj *fobj_from = fset_from->farr[ftype];
STFileObj *fobj_to = fset_to->farr[ftype];
if (!fobj_from && !fobj_to) continue;
// TODO
ASSERT(0);
if (fobj_from && fobj_to) {
// TODO
} else if (fobj_from) {
// TODO
} else {
// TODO
}
}
// TODO
ASSERT(0);
return 0;

1
source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c
View File

@ -533,6 +533,7 @@ int32_t tsdbSttFWriterClose(SSttFileWriter **ppWriter, int8_t abort, struct STFi
int32_t lino = 0;
if (!abort) {
ppWriter[0]->tFile.stt.nseg++;
if (ppWriter[0]->bData.nRow > 0) {
code = write_timeseries_block(ppWriter[0]);
TSDB_CHECK_CODE(code, lino, _exit);