From 50319f26303cf2d7cf6686aad06752220104022d Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Sun, 23 Apr 2023 18:00:02 +0800 Subject: [PATCH] more code --- .../src/tsdb/dev/inc/tsdbDataFReaderWriter.h | 16 ++++++++++++++-- source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h | 18 +++++++++--------- .../vnode/src/tsdb/dev/tsdbDataFReaderWriter.c | 15 ++++++++------- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h index 67491aa646..1ebcbf387b 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h @@ -23,10 +23,22 @@ extern "C" { #endif // SDataFileReader ============================================= -typedef struct SDataFileReader SDataFileReader; +typedef struct SDataFileReader SDataFileReader; +typedef struct SDataFileReaderConfig SDataFileReaderConfig; // SDataFileWriter ============================================= -typedef struct SDataFileWriter SDataFileWriter; +typedef struct SDataFileWriter SDataFileWriter; +typedef struct SDataFileWriterConfig SDataFileWriterConfig; + +struct SDataFileReaderConfig { + STsdb *pTsdb; + // TODO +}; + +struct SDataFileWriterConfig { + STsdb *pTsdb; + // TODO +}; #ifdef __cplusplus } diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h index acec854dd8..9a88d207fe 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h @@ -27,9 +27,9 @@ typedef struct SFileOp SFileOp; typedef struct SSttLvl SSttLvl; typedef enum { - TSDB_FOP_EXTEND = -2, + TSDB_FOP_NONE = 0, + TSDB_FOP_EXTEND, TSDB_FOP_CREATE, - TSDB_FOP_NONE, TSDB_FOP_DELETE, TSDB_FOP_TRUNCATE, } tsdb_fop_t; @@ -47,17 +47,17 @@ struct SFileOp { }; struct SSttLvl { - int32_t level; - int32_t nStt; - struct STFile *fSttList; + int32_t level; + int32_t nStt; + STFile *fSttList; LISTD(SSttLvl) listNode; }; struct SFileSet { - int32_t fid; - int64_t nextid; - struct STFile *farr[TSDB_FTYPE_MAX]; // file array - SSttLvl lvl0; // level 0 of .stt + int32_t fid; + int64_t nextid; + STFile *farr[TSDB_FTYPE_MAX]; // file array + SSttLvl lvl0; // level 0 of .stt }; #ifdef __cplusplus diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c b/source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c index 0e10d9735b..bccd5ce97a 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c @@ -15,11 +15,12 @@ #include "dev.h" -// struct SDataFReader { -// STsdb *pTsdb; -// // TODO -// }; +// SDataFileReader ============================================= +struct SDataFileReader { + // TODO +}; -// struct SDataFWriter { -// STsdb *pTsdb; -// }; \ No newline at end of file +// SDataFileWriter ============================================= +struct SDataFileWriter { + // TODO +}; \ No newline at end of file