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-06-01 17:05:20 +08:00
parent e99b33ede5
commit e07afeeeaf
4 changed files with 189 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h
View File

@ -54,7 +54,9 @@ typedef struct SDataFileWriterConfig {
int32_t tsdbDataFileWriterOpen(const SDataFileWriterConfig *config, SDataFileWriter **writer); int32_t tsdbDataFileWriterOpen(const SDataFileWriterConfig *config, SDataFileWriter **writer);
int32_t tsdbDataFileWriterClose(SDataFileWriter **writer, bool abort, STFileOp op[/*TSDB_FTYPE_MAX*/]); int32_t tsdbDataFileWriterClose(SDataFileWriter **writer, bool abort, STFileOp op[/*TSDB_FTYPE_MAX*/]);
int32_t tsdbDataFileWriteTSData(SDataFileWriter *writer, SRowInfo *row);
int32_t tsdbDataFileWriteTSDataBlock(SDataFileWriter *writer, SBlockData *bData); int32_t tsdbDataFileWriteTSDataBlock(SDataFileWriter *writer, SBlockData *bData);
int32_t tsdbDataFileFLushTSDataBlock(SDataFileWriter *writer);
#ifdef __cplusplus #ifdef __cplusplus
} }

14
source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c
View File

@ -440,6 +440,8 @@ _exit:
return code; return code;
} }
int32_t tsdbDataFileWriteTSDataBlock(SDataFileWriter *writer, SBlockData *bData) { int32_t tsdbDataFileWriteTSDataBlock(SDataFileWriter *writer, SBlockData *bData) {
if (bData->nRow == 0) return 0;
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(writer->config->tsdb->pVnode); int32_t vid = TD_VID(writer->config->tsdb->pVnode);
@ -468,3 +470,15 @@ _exit:
} }
return code; return code;
} }
int32_t tsdbDataFileWriteTSData(SDataFileWriter *writer, SRowInfo *row) {
// TODO
ASSERT(0);
return 0;
}
int32_t tsdbDataFileFLushTSDataBlock(SDataFileWriter *writer) {
// TODO
ASSERT(0);
return 0;
}

223
source/dnode/vnode/src/tsdb/dev/tsdbMerge.c
View File

@ -18,6 +18,7 @@
typedef struct { typedef struct {
STsdb *tsdb; STsdb *tsdb;
TFileSetArray *fsetArr; TFileSetArray *fsetArr;
int32_t sttTrigger; int32_t sttTrigger;
int32_t maxRow; int32_t maxRow;
int32_t minRow; int32_t minRow;
@ -26,17 +27,20 @@ typedef struct {
int64_t compactVersion; int64_t compactVersion;
int64_t cid; int64_t cid;
SSkmInfo skmTb[1]; SSkmInfo skmTb[1];
SSkmInfo skmRow[1];
// context // context
struct { struct {
bool opened; bool opened;
int64_t now;
STFileSet *fset; STFileSet *fset;
bool toData; bool toData;
int32_t level; int32_t level;
SSttLvl *lvl; SSttLvl *lvl;
STFileObj *fobj; STFileObj *fobj;
SRowInfo *row; TABLEID tbid[1];
SBlockData bData[1]; int32_t bDataIdx;
SBlockData bData[2];
} ctx[1]; } ctx[1];
TFileOpArray fopArr[1]; TFileOpArray fopArr[1];
@ -52,6 +56,7 @@ typedef struct {
} SMerger; } SMerger;
static int32_t tsdbMergerOpen(SMerger *merger) { static int32_t tsdbMergerOpen(SMerger *merger) {
merger->ctx->now = taosGetTimestampMs();
merger->maxRow = merger->tsdb->pVnode->config.tsdbCfg.maxRows; merger->maxRow = merger->tsdb->pVnode->config.tsdbCfg.maxRows;
merger->minRow = merger->tsdb->pVnode->config.tsdbCfg.minRows; merger->minRow = merger->tsdb->pVnode->config.tsdbCfg.minRows;
merger->szPage = merger->tsdb->pVnode->config.tsdbPageSize; merger->szPage = merger->tsdb->pVnode->config.tsdbPageSize;
@ -66,49 +71,95 @@ static int32_t tsdbMergerClose(SMerger *merger) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
SVnode *pVnode = merger->tsdb->pVnode; SVnode *pVnode = merger->tsdb->pVnode;
int32_t vid = TD_VID(pVnode);
STFileSystem *fs = merger->tsdb->pFS;
// edit file system // edit file system
code = tsdbFSEditBegin(fs, merger->fopArr, TSDB_FEDIT_MERGE); code = tsdbFSEditBegin(merger->tsdb->pFS, merger->fopArr, TSDB_FEDIT_MERGE);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
code = tsdbFSEditCommit(fs); code = tsdbFSEditCommit(merger->tsdb->pFS);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
ASSERT(merger->dataWriter == NULL);
ASSERT(merger->sttWriter == NULL);
ASSERT(merger->iterMerger == NULL);
ASSERT(TARRAY2_SIZE(merger->iterArr) == 0);
ASSERT(TARRAY2_SIZE(merger->sttReaderArr) == 0);
// clear the merge // clear the merge
TARRAY2_FREE(merger->iterArr); TARRAY2_FREE(merger->iterArr);
TARRAY2_FREE(merger->sttReaderArr); TARRAY2_FREE(merger->sttReaderArr);
TARRAY2_FREE(merger->fopArr); TARRAY2_FREE(merger->fopArr);
tBlockDataDestroy(merger->ctx->bData); for (int32_t i = 0; i < ARRAY_SIZE(merger->ctx->bData); i++) {
tBlockDataDestroy(merger->ctx->bData + i);
}
tDestroyTSchema(merger->skmTb->pTSchema); tDestroyTSchema(merger->skmTb->pTSchema);
tDestroyTSchema(merger->skmRow->pTSchema);
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(pVnode), lino, code);
} }
return 0; return code;
} }
static int32_t tsdbMergeToDataTableEnd(SMerger *merger) { static int32_t tsdbMergeToDataTableEnd(SMerger *merger) {
if (merger->ctx->bData->nRow == 0) return 0; if (merger->ctx->bData[0].nRow + merger->ctx->bData[1].nRow == 0) return 0;
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode); int32_t cidx = merger->ctx->bDataIdx;
int32_t pidx = (cidx + 1) % 2;
if (merger->ctx->bData->nRow < merger->minRow) { if (merger->ctx->bData[pidx].nRow > 0) {
code = tsdbSttFileWriteTSDataBlock(merger->sttWriter, merger->ctx->bData); ASSERT(merger->ctx->bData[pidx].nRow == merger->maxRow);
TSDB_CHECK_CODE(code, lino, _exit);
} else { int32_t numRow = (merger->ctx->bData[pidx].nRow + merger->ctx->bData[cidx].nRow) / 2;
code = tsdbDataFileWriteTSDataBlock(merger->dataWriter, merger->ctx->bData);
SRowInfo row[1] = {{
.suid = merger->ctx->tbid->suid,
.uid = merger->ctx->tbid->uid,
.row = tsdbRowFromBlockData(merger->ctx->bData + pidx, 0),
}};
for (int32_t i = 0; i < numRow; i++) {
row->row.iRow = i;
code = tsdbDataFileWriteTSData(merger->dataWriter, row);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
tBlockDataClear(merger->ctx->bData);
code = tsdbDataFileFLushTSDataBlock(merger->dataWriter);
TSDB_CHECK_CODE(code, lino, _exit);
for (int32_t i = numRow; i < merger->ctx->bData[pidx].nRow; i++) {
row->row.iRow = i;
code = tsdbDataFileWriteTSData(merger->dataWriter, row);
TSDB_CHECK_CODE(code, lino, _exit);
}
row->row = tsdbRowFromBlockData(merger->ctx->bData + cidx, 0);
for (int32_t i = 0; i < merger->ctx->bData[cidx].nRow; i++) {
row->row.iRow = i;
code = tsdbDataFileWriteTSData(merger->dataWriter, row);
TSDB_CHECK_CODE(code, lino, _exit);
}
} else {
if (merger->ctx->bData[cidx].nRow < merger->minRow) {
code = tsdbSttFileWriteTSDataBlock(merger->sttWriter, merger->ctx->bData + cidx);
TSDB_CHECK_CODE(code, lino, _exit);
} else {
code = tsdbDataFileWriteTSDataBlock(merger->dataWriter, merger->ctx->bData + cidx);
TSDB_CHECK_CODE(code, lino, _exit);
}
}
for (int32_t i = 0; i < ARRAY_SIZE(merger->ctx->bData); i++) {
tBlockDataReset(merger->ctx->bData + i);
}
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
} }
return code; return code;
} }
@ -116,43 +167,62 @@ _exit:
static int32_t tsdbMergeToDataTableBegin(SMerger *merger) { static int32_t tsdbMergeToDataTableBegin(SMerger *merger) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode);
code = tsdbUpdateSkmTb(merger->tsdb, (const TABLEID *)merger->ctx->row, merger->skmTb); code = tsdbUpdateSkmTb(merger->tsdb, merger->ctx->tbid, merger->skmTb);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
code = tBlockDataInit(merger->ctx->bData, (TABLEID *)merger->ctx->row, merger->skmTb->pTSchema, NULL, 0); for (int32_t i = 0; i < ARRAY_SIZE(merger->ctx->bData); i++) {
code = tBlockDataInit(merger->ctx->bData, merger->ctx->tbid, merger->skmTb->pTSchema, NULL, 0);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
}
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
} }
return code; return code;
} }
static int32_t tsdbMergeToData(SMerger *merger) { static int32_t tsdbMergeToDataLevel(SMerger *merger) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode);
while ((merger->ctx->row = tsdbIterMergerGet(merger->iterMerger))) { for (SRowInfo *row; (row = tsdbIterMergerGet(merger->iterMerger)) != NULL;) {
if (merger->ctx->row->uid != merger->ctx->bData->uid) { if (row->uid != merger->ctx->tbid->uid) {
code = tsdbMergeToDataTableEnd(merger); code = tsdbMergeToDataTableEnd(merger);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
merger->ctx->tbid->suid = row->suid;
merger->ctx->tbid->uid = row->uid;
code = tsdbMergeToDataTableBegin(merger); code = tsdbMergeToDataTableBegin(merger);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
code = tBlockDataAppendRow(merger->ctx->bData, &merger->ctx->row->row, NULL, merger->ctx->row->uid); TSDBKEY key[1] = {TSDBROW_KEY(&row->row)};
if (key->version <= merger->compactVersion //
&& merger->ctx->bData[merger->ctx->bDataIdx].nRow > 0 //
&& merger->ctx->bData[merger->ctx->bDataIdx].aTSKEY[merger->ctx->bData[merger->ctx->bDataIdx].nRow - 1] ==
key->ts) {
// update
code = tBlockDataUpdateRow(merger->ctx->bData + merger->ctx->bDataIdx, &row->row, NULL);
TSDB_CHECK_CODE(code, lino, _exit);
} else {
if (merger->ctx->bData[merger->ctx->bDataIdx].nRow >= merger->maxRow) {
int32_t idx = (merger->ctx->bDataIdx + 1) % 2;
code = tsdbDataFileWriteTSDataBlock(merger->dataWriter, merger->ctx->bData + idx);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
if (merger->ctx->bData->nRow >= merger->maxRow) { tBlockDataClear(merger->ctx->bData + idx);
code = tsdbDataFileWriteTSDataBlock(merger->dataWriter, merger->ctx->bData);
TSDB_CHECK_CODE(code, lino, _exit);
tBlockDataReset(merger->ctx->bData); // switch to next bData
merger->ctx->bDataIdx = idx;
}
code = tBlockDataAppendRow(merger->ctx->bData + merger->ctx->bDataIdx, &row->row, NULL, row->uid);
TSDB_CHECK_CODE(code, lino, _exit);
} }
code = tsdbIterMergerNext(merger->iterMerger); code = tsdbIterMergerNext(merger->iterMerger);
@ -164,7 +234,7 @@ static int32_t tsdbMergeToData(SMerger *merger) {
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
} }
return code; return code;
} }
@ -193,7 +263,6 @@ _exit:
static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) { static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode);
merger->ctx->toData = true; merger->ctx->toData = true;
merger->ctx->level = 0; merger->ctx->level = 0;
@ -213,7 +282,7 @@ static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) {
} else { } else {
merger->ctx->level++; merger->ctx->level++;
// add the operation // add remove operation
STFileOp op = { STFileOp op = {
.optype = TSDB_FOP_REMOVE, .optype = TSDB_FOP_REMOVE,
.fid = merger->ctx->fset->fid, .fid = merger->ctx->fset->fid,
@ -239,7 +308,7 @@ static int32_t tsdbMergeFileSetBeginOpenReader(SMerger *merger) {
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
} }
return code; return code;
} }
@ -288,12 +357,8 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode); int32_t vid = TD_VID(merger->tsdb->pVnode);
SDiskID did = { if (merger->ctx->lvl) {
.level = 0, // to existing level
.id = 0,
}; // TODO
if (merger->ctx->lvl) { // to existing level
SSttFileWriterConfig config[1] = {{ SSttFileWriterConfig config[1] = {{
.tsdb = merger->tsdb, .tsdb = merger->tsdb,
.maxRow = merger->maxRow, .maxRow = merger->maxRow,
@ -304,7 +369,15 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
}}; }};
code = tsdbSttFileWriterOpen(config, &merger->sttWriter); code = tsdbSttFileWriterOpen(config, &merger->sttWriter);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} else { // to new level } else {
SDiskID did[1];
int32_t level = tsdbFidLevel(merger->ctx->fset->fid, &merger->tsdb->keepCfg, merger->ctx->now);
if (tfsAllocDisk(merger->tsdb->pVnode->pTfs, level, did) < 0) {
code = TSDB_CODE_FS_NO_VALID_DISK;
TSDB_CHECK_CODE(code, lino, _exit);
}
// to new level
SSttFileWriterConfig config[1] = {{ SSttFileWriterConfig config[1] = {{
.tsdb = merger->tsdb, .tsdb = merger->tsdb,
.maxRow = merger->maxRow, .maxRow = merger->maxRow,
@ -314,7 +387,7 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
.file = .file =
{ {
.type = TSDB_FTYPE_STT, .type = TSDB_FTYPE_STT,
.did = did, .did = did[0],
.fid = merger->ctx->fset->fid, .fid = merger->ctx->fset->fid,
.cid = merger->cid, .cid = merger->cid,
.size = 0, .size = 0,
@ -328,8 +401,14 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
if (merger->ctx->toData) { // TODO if (merger->ctx->toData) {
tBlockDataReset(merger->ctx->bData); // TODO
SDiskID did[1];
int32_t level = tsdbFidLevel(merger->ctx->fset->fid, &merger->tsdb->keepCfg, merger->ctx->now);
if (tfsAllocDisk(merger->tsdb->pVnode->pTfs, level, did) < 0) {
code = TSDB_CODE_FS_NO_VALID_DISK;
TSDB_CHECK_CODE(code, lino, _exit);
}
SDataFileWriterConfig config = { SDataFileWriterConfig config = {
.tsdb = merger->tsdb, .tsdb = merger->tsdb,
@ -339,7 +418,7 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
[0] = [0] =
{ {
.type = TSDB_FTYPE_HEAD, .type = TSDB_FTYPE_HEAD,
.did = did, .did = did[0],
.fid = merger->ctx->fset->fid, .fid = merger->ctx->fset->fid,
.cid = merger->cid, .cid = merger->cid,
.size = 0, .size = 0,
@ -347,7 +426,7 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
[1] = [1] =
{ {
.type = TSDB_FTYPE_DATA, .type = TSDB_FTYPE_DATA,
.did = did, .did = did[0],
.fid = merger->ctx->fset->fid, .fid = merger->ctx->fset->fid,
.cid = merger->cid, .cid = merger->cid,
.size = 0, .size = 0,
@ -355,7 +434,7 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
[2] = [2] =
{ {
.type = TSDB_FTYPE_SMA, .type = TSDB_FTYPE_SMA,
.did = did, .did = did[0],
.fid = merger->ctx->fset->fid, .fid = merger->ctx->fset->fid,
.cid = merger->cid, .cid = merger->cid,
.size = 0, .size = 0,
@ -363,7 +442,7 @@ static int32_t tsdbMergeFileSetBeginOpenWriter(SMerger *merger) {
[3] = [3] =
{ {
.type = TSDB_FTYPE_TOMB, .type = TSDB_FTYPE_TOMB,
.did = did, .did = did[0],
.fid = merger->ctx->fset->fid, .fid = merger->ctx->fset->fid,
.cid = merger->cid, .cid = merger->cid,
.size = 0, .size = 0,
@ -384,7 +463,6 @@ _exit:
static int32_t tsdbMergeFileSetBegin(SMerger *merger) { static int32_t tsdbMergeFileSetBegin(SMerger *merger) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode);
ASSERT(TARRAY2_SIZE(merger->sttReaderArr) == 0); ASSERT(TARRAY2_SIZE(merger->sttReaderArr) == 0);
ASSERT(TARRAY2_SIZE(merger->iterArr) == 0); ASSERT(TARRAY2_SIZE(merger->iterArr) == 0);
@ -392,6 +470,13 @@ static int32_t tsdbMergeFileSetBegin(SMerger *merger) {
ASSERT(merger->sttWriter == NULL); ASSERT(merger->sttWriter == NULL);
ASSERT(merger->dataWriter == NULL); ASSERT(merger->dataWriter == NULL);
merger->ctx->tbid->suid = 0;
merger->ctx->tbid->uid = 0;
merger->ctx->bDataIdx = 0;
for (int32_t i = 0; i < ARRAY_SIZE(merger->ctx->bData); ++i) {
tBlockDataReset(merger->ctx->bData + i);
}
// open reader // open reader
code = tsdbMergeFileSetBeginOpenReader(merger); code = tsdbMergeFileSetBeginOpenReader(merger);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
@ -406,7 +491,7 @@ static int32_t tsdbMergeFileSetBegin(SMerger *merger) {
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
} }
return code; return code;
} }
@ -416,17 +501,7 @@ static int32_t tsdbMergeFileSetEndCloseWriter(SMerger *merger) {
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode); int32_t vid = TD_VID(merger->tsdb->pVnode);
STFileOp op[1]; STFileOp op[TSDB_FTYPE_MAX];
if (merger->ctx->toData) {
code = tsdbDataFileWriterClose(&merger->dataWriter, 0, op);
TSDB_CHECK_CODE(code, lino, _exit);
if (op->optype != TSDB_FOP_NONE) {
code = TARRAY2_APPEND_PTR(merger->fopArr, op);
TSDB_CHECK_CODE(code, lino, _exit);
}
}
code = tsdbSttFileWriterClose(&merger->sttWriter, 0, op); code = tsdbSttFileWriterClose(&merger->sttWriter, 0, op);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
@ -436,6 +511,17 @@ static int32_t tsdbMergeFileSetEndCloseWriter(SMerger *merger) {
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
if (merger->ctx->toData) {
// TODO
code = tsdbDataFileWriterClose(&merger->dataWriter, 0, op);
TSDB_CHECK_CODE(code, lino, _exit);
if (op->optype != TSDB_FOP_NONE) {
code = TARRAY2_APPEND_PTR(merger->fopArr, op);
TSDB_CHECK_CODE(code, lino, _exit);
}
}
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(vid, lino, code);
@ -485,7 +571,7 @@ static int32_t tsdbMergeFileSet(SMerger *merger, STFileSet *fset) {
// do merge // do merge
if (merger->ctx->toData) { if (merger->ctx->toData) {
code = tsdbMergeToData(merger); code = tsdbMergeToDataLevel(merger);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} else { } else {
code = tsdbMergeToUpperLevel(merger); code = tsdbMergeToUpperLevel(merger);
@ -507,16 +593,13 @@ _exit:
static int32_t tsdbDoMerge(SMerger *merger) { static int32_t tsdbDoMerge(SMerger *merger) {
int32_t code = 0; int32_t code = 0;
int32_t lino = 0; int32_t lino = 0;
int32_t vid = TD_VID(merger->tsdb->pVnode);
STFileSet *fset; STFileSet *fset;
SSttLvl *lvl;
STFileObj *fobj;
TARRAY2_FOREACH(merger->fsetArr, fset) { TARRAY2_FOREACH(merger->fsetArr, fset) {
lvl = TARRAY2_SIZE(fset->lvlArr) > 0 ? TARRAY2_FIRST(fset->lvlArr) : NULL; SSttLvl *lvl = TARRAY2_SIZE(fset->lvlArr) > 0 ? TARRAY2_FIRST(fset->lvlArr) : NULL;
if (!lvl || lvl->level != 0 || TARRAY2_SIZE(lvl->fobjArr) == 0) continue; if (!lvl || lvl->level != 0 || TARRAY2_SIZE(lvl->fobjArr) == 0) continue;
fobj = TARRAY2_FIRST(lvl->fobjArr); STFileObj *fobj = TARRAY2_FIRST(lvl->fobjArr);
if (fobj->f->stt->nseg < merger->sttTrigger) continue; if (fobj->f->stt->nseg < merger->sttTrigger) continue;
if (!merger->ctx->opened) { if (!merger->ctx->opened) {
@ -535,9 +618,9 @@ static int32_t tsdbDoMerge(SMerger *merger) {
_exit: _exit:
if (code) { if (code) {
TSDB_ERROR_LOG(vid, lino, code); TSDB_ERROR_LOG(TD_VID(merger->tsdb->pVnode), lino, code);
} else { } else {
tsdbDebug("vgId:%d %s done", vid, __func__); tsdbDebug("vgId:%d %s done", TD_VID(merger->tsdb->pVnode), __func__);
} }
return code; return code;
} }

10
source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c
View File

@ -775,19 +775,15 @@ int32_t tsdbSttFileWriteTSData(SSttFileWriter *writer, SRowInfo *row) {
} }
// row to col conversion // row to col conversion
if (key->version <= writer->config->compactVersion) { if (key->version <= writer->config->compactVersion //
if (writer->bData->nRow > 0 // && writer->bData->nRow > 0 //
&& (writer->bData->uid // && (writer->bData->uid //
? writer->bData->uid ? writer->bData->uid //
: writer->bData->aUid[writer->bData->nRow - 1]) == row->uid // : writer->bData->aUid[writer->bData->nRow - 1]) == row->uid //
&& writer->bData->aTSKEY[writer->bData->nRow - 1] == key->ts // && writer->bData->aTSKEY[writer->bData->nRow - 1] == key->ts //
) { ) {
code = tBlockDataUpdateRow(writer->bData, &row->row, writer->config->skmRow->pTSchema); code = tBlockDataUpdateRow(writer->bData, &row->row, writer->config->skmRow->pTSchema);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} else {
code = tBlockDataAppendRow(writer->bData, &row->row, writer->config->skmRow->pTSchema, row->uid);
TSDB_CHECK_CODE(code, lino, _exit);
}
} else { } else {
if (writer->bData->nRow >= writer->config->maxRow) { if (writer->bData->nRow >= writer->config->maxRow) {
code = tsdbSttFileDoWriteTSDataBlock(writer); code = tsdbSttFileDoWriteTSDataBlock(writer);