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-05 16:02:53 +08:00
parent ac62592140
commit 934a170e64
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,12 @@ static int32_t tsdbCommitDelData(SCommitter2 *committer) {
SMemTable *mem = committer->tsdb->imem; SMemTable *mem = committer->tsdb->imem;
if (mem->nDel == 0) goto _exit; if (mem->nDel == 0 //
|| (committer->ctx->fset == NULL //
&& committer->sttWriter == NULL) //
) {
goto _exit;
}
SRBTreeIter iter[1] = {tRBTreeIterCreate(committer->tsdb->imem->tbDataTree, 1)}; SRBTreeIter iter[1] = {tRBTreeIterCreate(committer->tsdb->imem->tbDataTree, 1)};
@ -248,7 +253,12 @@ static int32_t tsdbCommitDelData(SCommitter2 *committer) {
record->ekey = delData->eKey; record->ekey = delData->eKey;
} }
code = tsdbSttFileWriteDelRecord(committer->sttWriter, record); // TODO if (!committer->sttWriter) {
code = tsdbCommitOpenWriter(committer);
TSDB_CHECK_CODE(code, lino, _exit);
}
code = tsdbSttFileWriteDelRecord(committer->sttWriter, record);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }
} }

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

@ -262,6 +262,11 @@ int32_t tsdbSttFileReadDelBlock(SSttSegReader *reader, const SDelBlk *delBlk, SD
&reader->reader->config->bufArr[2]); &reader->reader->config->bufArr[2]);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
for (int32_t j = 0; j < delBlk->numRec; ++j) {
code = TARRAY2_APPEND(&dData->dataArr[i], ((int64_t *)(reader->reader->config->bufArr[1]))[j]);
continue;
}
size += delBlk->size[i]; size += delBlk->size[i];
} }
@ -474,7 +479,7 @@ static int32_t tsdbSttFileDoWriteDelBlock(SSttFileWriter *writer) {
for (int32_t i = 0; i < ARRAY_SIZE(writer->dData->dataArr); i++) { for (int32_t i = 0; i < ARRAY_SIZE(writer->dData->dataArr); i++) {
int32_t size; int32_t size;
code = tsdbCmprData((uint8_t *)TARRAY2_DATA(&writer->dData->dataArr[i]), code = tsdbCmprData((uint8_t *)TARRAY2_DATA(&writer->dData->dataArr[i]),
TARRAY2_DATA_LEN(&writer->dData->dataArr[i]), TSDB_DATA_TYPE_BIGINT, writer->config->cmprAlg, TARRAY2_DATA_LEN(&writer->dData->dataArr[i]), TSDB_DATA_TYPE_BIGINT, TWO_STAGE_COMP,
&writer->config->aBuf[0], 0, &size, &writer->config->aBuf[1]); &writer->config->aBuf[0], 0, &size, &writer->config->aBuf[1]);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);