From 172eeee609b8854e00d81514f53a92824aee3c82 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Sun, 23 Apr 2023 15:45:57 +0800 Subject: [PATCH] refact more code --- source/dnode/vnode/src/tsdb/dev/dev.h | 21 +++------- .../tsdbDataFReaderWriter.h} | 17 +++----- source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h | 39 +++++++++++++++++++ .../vnode/src/tsdb/dev/{ => inc}/tsdbFS.h | 2 +- .../vnode/src/tsdb/dev/{ => inc}/tsdbFSet.h | 2 +- .../vnode/src/tsdb/dev/{ => inc}/tsdbFile.h | 2 +- .../tsdbSttFReaderWriter.h} | 2 +- .../vnode/src/tsdb/dev/{ => inc}/tsdbUtil.h | 2 +- ...dbSttFReader.c => tsdbDataFReaderWriter.c} | 22 +++-------- ...sdbSttFWriter.c => tsdbSttFReaderWriter.c} | 0 10 files changed, 62 insertions(+), 47 deletions(-) rename source/dnode/vnode/src/tsdb/dev/{tsdbSttFReader.h => inc/tsdbDataFReaderWriter.h} (67%) create mode 100644 source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h rename source/dnode/vnode/src/tsdb/dev/{ => inc}/tsdbFS.h (98%) rename source/dnode/vnode/src/tsdb/dev/{ => inc}/tsdbFSet.h (98%) rename source/dnode/vnode/src/tsdb/dev/{ => inc}/tsdbFile.h (98%) rename source/dnode/vnode/src/tsdb/dev/{tsdbSttFWriter.h => inc/tsdbSttFReaderWriter.h} (98%) rename source/dnode/vnode/src/tsdb/dev/{ => inc}/tsdbUtil.h (99%) rename source/dnode/vnode/src/tsdb/dev/{tsdbSttFReader.c => tsdbDataFReaderWriter.c} (64%) rename source/dnode/vnode/src/tsdb/dev/{tsdbSttFWriter.c => tsdbSttFReaderWriter.c} (100%) diff --git a/source/dnode/vnode/src/tsdb/dev/dev.h b/source/dnode/vnode/src/tsdb/dev/dev.h index 36e5dbc625..fca0131073 100644 --- a/source/dnode/vnode/src/tsdb/dev/dev.h +++ b/source/dnode/vnode/src/tsdb/dev/dev.h @@ -22,26 +22,17 @@ extern "C" { #endif -typedef struct SFDataPtr { - int64_t offset; - int64_t size; -} SFDataPtr; +#include "inc/tsdbUtil.h" -typedef struct { - int64_t prevFooter; - SFDataPtr dict[4]; // 0:bloom filter, 1:SSttBlk, 2:STbStatisBlk, 3:SDelBlk - uint8_t reserved[24]; -} SFSttFooter; +#include "inc/tsdbFile.h" -#include "tsdbUtil.h" +#include "inc/tsdbFSet.h" -#include "tsdbFile.h" +#include "inc/tsdbFS.h" -#include "tsdbFSet.h" +#include "inc/tsdbSttFReaderWriter.h" -#include "tsdbFS.h" - -#include "tsdbSttFWriter.h" +#include "inc/tsdbDataFReaderWriter.h" #ifdef __cplusplus } diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFReader.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h similarity index 67% rename from source/dnode/vnode/src/tsdb/dev/tsdbSttFReader.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h index bda94a96a3..a931ac13d4 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFReader.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFReaderWriter.h @@ -13,30 +13,25 @@ * along with this program. If not, see . */ -#ifndef _TD_TSDB_STT_FILE_READER_H -#define _TD_TSDB_STT_FILE_READER_H +#include "tsdbDef.h" -#include "tsdb.h" +#ifndef _TD_TSDB_DATA_F_READER_WRITER_H_ +#define _TD_TSDB_DATA_F_READER_WRITER_H_ #ifdef __cplusplus extern "C" { #endif /* Exposed Handle */ -struct SSttFReader; -struct SSttFReaderConf; +typedef struct SDataFReader SDataFReader; +typedef struct SDataFWriter SDataFWriter; /* Exposed APIs */ -int32_t tsdbSttFReaderOpen(const struct SSttFReaderConf *pConf, struct SSttFReader **ppReader); -int32_t tsdbSttFReaderClose(struct SSttFReader *pReader); /* Exposed Structs */ -struct SSttFReaderConf { - // TODO -}; #ifdef __cplusplus } #endif -#endif /*_TD_TSDB_STT_FILE_READER_H*/ \ No newline at end of file +#endif /*_TD_TSDB_DATA_F_READER_WRITER_H_*/ \ No newline at end of file diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h new file mode 100644 index 0000000000..f17dbcc605 --- /dev/null +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#ifndef _TD_TSDB_DEF_H_ +#define _TD_TSDB_DEF_H_ + +#include "tsdb.h" + +#ifdef __cplusplus +extern "C" { +#endif +typedef struct SFDataPtr { + int64_t offset; + 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 +} +#endif + +#endif /*_TD_TSDB_DEF_H_*/ \ No newline at end of file diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFS.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS.h similarity index 98% rename from source/dnode/vnode/src/tsdb/dev/tsdbFS.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbFS.h index 0e9428fdb4..3584cf7e0e 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFS.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS.h @@ -16,7 +16,7 @@ #ifndef _TSDB_FILE_SYSTEM_H #define _TSDB_FILE_SYSTEM_H -#include "tsdb.h" +#include "tsdbDef.h" #ifdef __cplusplus extern "C" { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFSet.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h similarity index 98% rename from source/dnode/vnode/src/tsdb/dev/tsdbFSet.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h index effe8c0494..6fb973635c 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFSet.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h @@ -16,7 +16,7 @@ #ifndef _TSDB_FILE_SET_H #define _TSDB_FILE_SET_H -#include "tsdb.h" +#include "tsdbDef.h" #ifdef __cplusplus extern "C" { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFile.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFile.h similarity index 98% rename from source/dnode/vnode/src/tsdb/dev/tsdbFile.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbFile.h index c70a523636..2ccce655e9 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFile.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFile.h @@ -16,7 +16,7 @@ #ifndef _TSDB_FILE_H #define _TSDB_FILE_H -#include "tsdb.h" +#include "tsdbDef.h" #ifdef __cplusplus extern "C" { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFReaderWriter.h similarity index 98% rename from source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFReaderWriter.h index 6c199476f2..01009d54b6 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFReaderWriter.h @@ -16,7 +16,7 @@ #ifndef _TSDB_STT_FILE_WRITER_H #define _TSDB_STT_FILE_WRITER_H -#include "tsdbFile.h" +#include "tsdbDef.h" #ifdef __cplusplus extern "C" { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbUtil.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil.h similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbUtil.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil.h index 292f14395b..ed4de45736 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbUtil.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil.h @@ -16,7 +16,7 @@ #ifndef _TSDB_UTIL_H #define _TSDB_UTIL_H -#include "tsdb.h" +#include "tsdbDef.h" #ifdef __cplusplus extern "C" { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFReader.c b/source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c similarity index 64% rename from source/dnode/vnode/src/tsdb/dev/tsdbSttFReader.c rename to source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c index f975b91abd..433da91948 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFReader.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbDataFReaderWriter.c @@ -13,23 +13,13 @@ * along with this program. If not, see . */ -#include "tsdbSttFReader.h" #include "dev.h" -struct SSttFReader { - STsdb *pTsdb; - SFSttFooter footer; - const void *bloomFilter; +struct SDataFReader { + STsdb *pTsdb; + // TODO }; -int32_t tsdbSttFReaderOpen(const struct SSttFReaderConf *pConf, struct SSttFReader **ppReader) { - int32_t code = 0; - // TODO - return code; -} - -int32_t tsdbSttFReaderClose(struct SSttFReader *pReader) { - int32_t code = 0; - // TODO - return code; -} +struct SDataFWriter { + STsdb *pTsdb; +}; \ No newline at end of file diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c b/source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c rename to source/dnode/vnode/src/tsdb/dev/tsdbSttFReaderWriter.c