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 2024-03-05 16:13:14 +08:00
parent 8aadc70b06
commit 1440c1b942
3 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source/dnode/vnode/src/tsdb/tsdbDataFileRW.c
View File

@ -770,42 +770,37 @@ int32_t tsdbFileWriteBrinBlock(STsdbFD *fd, SBrinBlock *brinBlock, int8_t cmprAl
// write primary keys to file // write primary keys to file
if (brinBlock->numOfPKs > 0) { if (brinBlock->numOfPKs > 0) {
#if 0 for (int i = 0; i < 2; i++) {
SBufferWriter writer; tBufferClear(&buffers[i]);
SValueColumnCompressInfo vcinfo = {.cmprAlg = cmprAlg};
tBufferClear(NULL);
tBufferWriterInit(&writer, true, 0, NULL /* TODO */);
for (int32_t i = 0; i < brinBlk.numOfPKs; i++) {
code = tValueColumnCompress(&brinBlock->firstKeyPKs[i], &vcinfo, NULL /* TODO */, NULL /* TODO */);
if (code) return code;
code = tValueColumnCompressInfoEncode(&vcinfo, &writer);
if (code) return code;
} }
for (int32_t i = 0; i < brinBlk.numOfPKs; i++) { // encode
code = tValueColumnCompress(&brinBlock->lastKeyPKs[i], &vcinfo, NULL /* TODO */, NULL /* TODO */); for (int i = 0; i < brinBlock->numOfPKs; i++) {
SValueColumnCompressInfo info = {
.cmprAlg = cmprAlg,
};
code = tValueColumnCompress(&brinBlock->firstKeyPKs[i], &info, &buffers[1], &buffers[2]);
if (code) return code; if (code) return code;
code = tValueColumnCompressInfoEncode(&info, &buffers[0]);
code = tValueColumnCompressInfoEncode(&vcinfo, &writer); if (code) return code;
}
for (int i = 0; i < brinBlock->numOfPKs; i++) {
SValueColumnCompressInfo info = {
.cmprAlg = cmprAlg,
};
code = tValueColumnCompress(&brinBlock->lastKeyPKs[i], &info, &buffers[1], &buffers[2]);
if (code) return code;
code = tValueColumnCompressInfoEncode(&info, &buffers[0]);
if (code) return code; if (code) return code;
} }
// write to file // write to file
// TODO for (int i = 0; i < 2; i++) {
ASSERT(0); code = tsdbWriteFile(fd, *fileSize, buffers[i].data, buffers[i].size);
// code = tsdbWriteFile(fd, *fileSize, NULL /* TODO */, tBufferGetSize(NULL)); if (code) return code;
// if (code) return code; brinBlk.dp->size += buffers[i].size;
// *fileSize += tBufferGetSize(NULL); *fileSize += buffers[i].size;
// brinBlk->dp->size += tBufferGetSize(NULL); }
// code = tsdbWriteFile(fd, *fileSize, NULL /* TODO */, tBufferGetSize(NULL));
// if (code) return code;
// *fileSize += tBufferGetSize(NULL);
// brinBlk->dp->size += tBufferGetSize(NULL);
#endif
} }
// append to brinBlkArray // append to brinBlkArray

11
source/dnode/vnode/src/tsdb/tsdbFSetRW.c
View File

@ -21,7 +21,7 @@ struct SFSetWriter {
SSkmInfo skmTb[1]; SSkmInfo skmTb[1];
SSkmInfo skmRow[1]; SSkmInfo skmRow[1];
uint8_t *bufArr[10]; SBuffer buffers[10];
struct { struct {
TABLEID tbid[1]; TABLEID tbid[1];
@ -148,7 +148,7 @@ int32_t tsdbFSetWriterOpen(SFSetWriterConfig *config, SFSetWriter **writer) {
.compactVersion = config->compactVersion, .compactVersion = config->compactVersion,
.skmTb = writer[0]->skmTb, .skmTb = writer[0]->skmTb,
.skmRow = writer[0]->skmRow, .skmRow = writer[0]->skmRow,
.bufArr = writer[0]->bufArr, .buffers = writer[0]->buffers,
}; };
for (int32_t ftype = 0; ftype < TSDB_FTYPE_MAX; ++ftype) { for (int32_t ftype = 0; ftype < TSDB_FTYPE_MAX; ++ftype) {
dataWriterConfig.files[ftype].exist = config->files[ftype].exist; dataWriterConfig.files[ftype].exist = config->files[ftype].exist;
@ -172,7 +172,8 @@ int32_t tsdbFSetWriterOpen(SFSetWriterConfig *config, SFSetWriter **writer) {
.level = config->level, .level = config->level,
.skmTb = writer[0]->skmTb, .skmTb = writer[0]->skmTb,
.skmRow = writer[0]->skmRow, .skmRow = writer[0]->skmRow,
.bufArr = writer[0]->bufArr, .buffers = writer[0]->buffers,
}; };
code = tsdbSttFileWriterOpen(&sttWriterConfig, &writer[0]->sttWriter); code = tsdbSttFileWriterOpen(&sttWriterConfig, &writer[0]->sttWriter);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
@ -208,8 +209,8 @@ int32_t tsdbFSetWriterClose(SFSetWriter **writer, bool abort, TFileOpArray *fopA
for (int32_t i = 0; i < ARRAY_SIZE(writer[0]->blockData); i++) { for (int32_t i = 0; i < ARRAY_SIZE(writer[0]->blockData); i++) {
tBlockDataDestroy(&writer[0]->blockData[i]); tBlockDataDestroy(&writer[0]->blockData[i]);
} }
for (int32_t i = 0; i < ARRAY_SIZE(writer[0]->bufArr); i++) { for (int32_t i = 0; i < ARRAY_SIZE(writer[0]->buffers); i++) {
tFree(writer[0]->bufArr[i]); tBufferDestroy(&writer[0]->buffers[i]);
} }
tDestroyTSchema(writer[0]->skmRow->pTSchema); tDestroyTSchema(writer[0]->skmRow->pTSchema);
tDestroyTSchema(writer[0]->skmTb->pTSchema); tDestroyTSchema(writer[0]->skmTb->pTSchema);

2
source/dnode/vnode/src/tsdb/tsdbSttFileRW.h
View File

@ -86,7 +86,7 @@ struct SSttFileWriterConfig {
int32_t level; int32_t level;
SSkmInfo *skmTb; SSkmInfo *skmTb;
SSkmInfo *skmRow; SSkmInfo *skmRow;
uint8_t **bufArr; SBuffer *buffers;
}; };
#ifdef __cplusplus #ifdef __cplusplus