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-04-23 16:18:18 +08:00
parent 172eeee609
commit 81efe36d30
8 changed files with 69 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h
View File

@ -21,16 +21,19 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef struct SFDataPtr {
typedef struct SFDataPtr SFDataPtr;
extern int32_t tsdbOpenFile(const char *path, int32_t szPage, int32_t flag, STsdbFD **ppFD);
extern void tsdbCloseFile(STsdbFD **ppFD);
extern int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size);
extern int32_t tsdbReadFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size);
extern int32_t tsdbFsyncFile(STsdbFD *pFD);
struct SFDataPtr {
int64_t offset; int64_t offset;
int64_t size; int64_t size;
} SFDataPtr; };
typedef struct {
int64_t prevFooter;
SFDataPtr dict[4]; // 0:bloom filter, 1:SSttBlk, 2:STbStatisBlk, 3:SDelBlk
uint8_t reserved[24];
} SFSttFooter;
#ifdef __cplusplus #ifdef __cplusplus
} }

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

@ -16,7 +16,7 @@
#ifndef _TSDB_FILE_SYSTEM_H #ifndef _TSDB_FILE_SYSTEM_H
#define _TSDB_FILE_SYSTEM_H #define _TSDB_FILE_SYSTEM_H
#include "tsdbDef.h" #include "tsdbFSet.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h
View File

@ -16,7 +16,7 @@
#ifndef _TSDB_FILE_SET_H #ifndef _TSDB_FILE_SET_H
#define _TSDB_FILE_SET_H #define _TSDB_FILE_SET_H
#include "tsdbDef.h" #include "tsdbFile.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -35,8 +35,8 @@ typedef enum {
struct SFileOp { struct SFileOp {
tsdb_fop_t op; tsdb_fop_t op;
int32_t fid; int32_t fid;
struct STFile oState; // old file state STFile oState; // old file state
struct STFile nState; // new file state STFile nState; // new file state
}; };
struct SSttLvl { struct SSttLvl {

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

@ -66,7 +66,7 @@ struct STFile {
} tomb; } tomb;
}; };
LISTD(struct STFile) listNode; LISTD(STFile) listNode;
}; };
#ifdef __cplusplus #ifdef __cplusplus

35
source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFReaderWriter.h
View File

@ -16,16 +16,32 @@
#ifndef _TSDB_STT_FILE_WRITER_H #ifndef _TSDB_STT_FILE_WRITER_H
#define _TSDB_STT_FILE_WRITER_H #define _TSDB_STT_FILE_WRITER_H
#include "tsdbDef.h" #include "tsdbFS.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct SSttFWriter; // SSttFReader ==========================================
struct SSttFWriterConf { typedef struct SSttFReader SSttFReader;
typedef struct SSttFReaderConfig SSttFReaderConfig;
int32_t tsdbSttFReaderOpen(const SSttFReaderConfig *config, SSttFReader **ppReader);
int32_t tsdbSttFReaderClose(SSttFReader **ppReader);
// SSttFWriter ==========================================
typedef struct SSttFWriter SSttFWriter;
typedef struct SSttFWriterConfig SSttFWriterConfig;
int32_t tsdbSttFWriterOpen(const SSttFWriterConfig *config, SSttFWriter **ppWriter);
int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter, int8_t abort, struct SFileOp *op);
int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow);
int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData);
/* ------------------------------------------------- */
struct SSttFWriterConfig {
STsdb *pTsdb; STsdb *pTsdb;
struct STFile file; STFile file;
int32_t maxRow; int32_t maxRow;
int32_t szPage; int32_t szPage;
int8_t cmprAlg; int8_t cmprAlg;
@ -34,10 +50,13 @@ struct SSttFWriterConf {
uint8_t **aBuf; uint8_t **aBuf;
}; };
int32_t tsdbSttFWriterOpen(const struct SSttFWriterConf *pConf, struct SSttFWriter **ppWriter); struct SSttFReaderConfig {
int32_t tsdbSttFWriterClose(struct SSttFWriter **ppWriter, int8_t abort, struct SFileOp *op); STsdb *pTsdb;
int32_t tsdbSttFWriteTSData(struct SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow); SSkmInfo *pSkmTb;
int32_t tsdbSttFWriteDLData(struct SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData); SSkmInfo *pSkmRow;
uint8_t **aBuf;
// TODO
};
#ifdef __cplusplus #ifdef __cplusplus
} }

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

@ -44,7 +44,7 @@ static int32_t open_committer_writer(SCommitter *pCommitter) {
STsdb *pTsdb = pCommitter->pTsdb; STsdb *pTsdb = pCommitter->pTsdb;
struct SSttFWriterConf conf = { struct SSttFWriterConfig conf = {
.pTsdb = pCommitter->pTsdb, .pTsdb = pCommitter->pTsdb,
.maxRow = pCommitter->maxRow, .maxRow = pCommitter->maxRow,
.szPage = pCommitter->pTsdb->pVnode->config.tsdbPageSize, .szPage = pCommitter->pTsdb->pVnode->config.tsdbPageSize,

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

@ -15,11 +15,11 @@
#include "dev.h" #include "dev.h"
struct SDataFReader { // struct SDataFReader {
STsdb *pTsdb; // STsdb *pTsdb;
// TODO // // TODO
}; // };
struct SDataFWriter { // struct SDataFWriter {
STsdb *pTsdb; // STsdb *pTsdb;
}; // };

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

@ -15,16 +15,16 @@
#include "dev.h" #include "dev.h"
extern int32_t tsdbOpenFile(const char *path, int32_t szPage, int32_t flag, STsdbFD **ppFD); typedef struct {
extern void tsdbCloseFile(STsdbFD **ppFD); int64_t prevFooter;
extern int32_t tsdbWriteFile(STsdbFD *pFD, int64_t offset, const uint8_t *pBuf, int64_t size); SFDataPtr dict[4]; // 0:bloom filter, 1:SSttBlk, 2:STbStatisBlk, 3:SDelBlk
extern int32_t tsdbReadFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t size); uint8_t reserved[24];
extern int32_t tsdbFsyncFile(STsdbFD *pFD); } SFSttFooter;
struct SSttFWriter { struct SSttFWriter {
struct SSttFWriterConf config; SSttFWriterConfig config;
// file // file
struct STFile tFile; STFile tFile;
// data // data
SFSttFooter footer; SFSttFooter footer;
SBlockData bData; SBlockData bData;
@ -325,7 +325,7 @@ static int32_t write_file_header(struct SSttFWriter *pWriter) {
return 0; return 0;
} }
static int32_t create_stt_fwriter(const struct SSttFWriterConf *pConf, struct SSttFWriter **ppWriter) { static int32_t create_stt_fwriter(const SSttFWriterConfig *pConf, struct SSttFWriter **ppWriter) {
int32_t code = 0; int32_t code = 0;
// alloc // alloc
@ -449,7 +449,7 @@ static int32_t close_stt_fwriter(struct SSttFWriter *pWriter) {
return 0; return 0;
} }
int32_t tsdbSttFWriterOpen(const struct SSttFWriterConf *pConf, struct SSttFWriter **ppWriter) { int32_t tsdbSttFWriterOpen(const SSttFWriterConfig *pConf, struct SSttFWriter **ppWriter) {
int32_t code = 0; int32_t code = 0;
int32_t lino; int32_t lino;