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-31 09:02:50 +08:00
parent 838a47cb45
commit 938d87f601
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h
View File

@ -15,6 +15,7 @@
#include "tsdbDataFileRW.h" #include "tsdbDataFileRW.h"
#include "tsdbFS.h" #include "tsdbFS.h"
#include "tsdbIter.h"
#include "tsdbSttFileRW.h" #include "tsdbSttFileRW.h"
#include "tsdbUtil.h" #include "tsdbUtil.h"

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

@ -71,7 +71,7 @@ struct SSttFileWriterConfig {
int32_t maxRow; int32_t maxRow;
int32_t szPage; int32_t szPage;
int8_t cmprAlg; int8_t cmprAlg;
int64_t compVer; // compact version int64_t compactVersion; // compact version
SSkmInfo *skmTb; SSkmInfo *skmTb;
SSkmInfo *skmRow; SSkmInfo *skmRow;
uint8_t **aBuf; uint8_t **aBuf;

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

@ -16,7 +16,16 @@
#include "inc/tsdbMerge.h" #include "inc/tsdbMerge.h"
typedef struct { typedef struct {
STsdb *tsdb; STsdb *tsdb;
int32_t maxRow;
int32_t minRow;
int32_t szPage;
int8_t cmprAlg;
int64_t compactVersion;
int64_t cid;
SSkmInfo skmTb;
SSkmInfo skmRow;
uint8_t *aBuf[5];
// context // context
struct { struct {
bool opened; bool opened;
@ -26,18 +35,11 @@ typedef struct {
SRowInfo *row; SRowInfo *row;
SBlockData bData; SBlockData bData;
} ctx[1]; } ctx[1];
// config
int32_t maxRow;
int32_t minRow;
int32_t szPage;
int8_t cmprAlg;
int64_t cid;
SSkmInfo skmTb;
SSkmInfo skmRow;
uint8_t *aBuf[5];
// reader // reader
TARRAY2(SSttFileReader *) sttReaderArr; TARRAY2(SSttFileReader *) sttReaderArr[1];
SDataFileReader *dataReader; SDataFileReader *dataReader;
TTsdbIterArray iterArr[1];
SIterMerger *iterMerger;
// writer // writer
SSttFileWriter *sttWriter; SSttFileWriter *sttWriter;
SDataFileWriter *dataWriter; SDataFileWriter *dataWriter;
@ -203,7 +205,7 @@ static int32_t tsdbMergeFileSetBegin(SMerger *merger) {
code = tsdbSttFReaderOpen(fobj->fname, &config, &reader); code = tsdbSttFReaderOpen(fobj->fname, &config, &reader);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
code = TARRAY2_APPEND(&merger->sttReaderArr, reader); code = TARRAY2_APPEND(merger->sttReaderArr, reader);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
// add the operation // add the operation
@ -334,12 +336,11 @@ int32_t tsdbMerge(STsdb *tsdb) {
int32_t code = 0; int32_t code = 0;
int32_t lino; int32_t lino;
SVnode *vnode = tsdb->pVnode; int32_t vid = TD_VID(tsdb->pVnode);
int32_t vid = TD_VID(vnode);
STFileSystem *fs = tsdb->pFS; STFileSystem *fs = tsdb->pFS;
STFileSet *fset; STFileSet *fset;
STFileObj *fobj; STFileObj *fobj;
int32_t sttTrigger = vnode->config.sttTrigger; int32_t sttTrigger = tsdb->pVnode->config.sttTrigger;
SMerger merger[1]; SMerger merger[1];
merger->tsdb = tsdb; merger->tsdb = tsdb;