From 4138361839d7d56ab0a7811a2d24a18a05e00b17 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 14 Jun 2023 14:05:41 +0800 Subject: [PATCH] refact code --- source/dnode/vnode/CMakeLists.txt | 48 +++++++++---------- source/dnode/vnode/src/tsdb/dev/dev.h | 41 ---------------- .../vnode/src/tsdb/{dev => }/tsdbCommit2.c | 2 +- .../src/tsdb/{dev/inc => }/tsdbCommit2.h | 0 .../vnode/src/tsdb/{dev => }/tsdbDataFileRW.c | 2 +- .../src/tsdb/{dev/inc => }/tsdbDataFileRW.h | 0 .../vnode/src/tsdb/{dev/inc => }/tsdbDef.h | 0 .../dnode/vnode/src/tsdb/{dev => }/tsdbFS2.c | 2 +- .../vnode/src/tsdb/{dev/inc => }/tsdbFS2.h | 0 .../vnode/src/tsdb/{dev => }/tsdbFSet2.c | 2 +- .../vnode/src/tsdb/{dev/inc => }/tsdbFSet2.h | 0 .../vnode/src/tsdb/{dev => }/tsdbFile2.c | 2 +- .../vnode/src/tsdb/{dev/inc => }/tsdbFile2.h | 0 .../dnode/vnode/src/tsdb/{dev => }/tsdbIter.c | 2 +- .../vnode/src/tsdb/{dev/inc => }/tsdbIter.h | 0 .../vnode/src/tsdb/{dev => }/tsdbMerge.c | 2 +- .../vnode/src/tsdb/{dev/inc => }/tsdbMerge.h | 0 source/dnode/vnode/src/tsdb/tsdbOpen.c | 2 +- .../vnode/src/tsdb/{dev => }/tsdbSttFileRW.c | 2 +- .../src/tsdb/{dev/inc => }/tsdbSttFileRW.h | 0 .../vnode/src/tsdb/{dev => }/tsdbUtil2.c | 2 +- .../vnode/src/tsdb/{dev/inc => }/tsdbUtil2.h | 0 22 files changed, 33 insertions(+), 76 deletions(-) delete mode 100644 source/dnode/vnode/src/tsdb/dev/dev.h rename source/dnode/vnode/src/tsdb/{dev => }/tsdbCommit2.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbCommit2.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbDataFileRW.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbDataFileRW.h (100%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbDef.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbFS2.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbFS2.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbFSet2.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbFSet2.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbFile2.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbFile2.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbIter.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbIter.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbMerge.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbMerge.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbSttFileRW.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbSttFileRW.h (100%) rename source/dnode/vnode/src/tsdb/{dev => }/tsdbUtil2.c (99%) rename source/dnode/vnode/src/tsdb/{dev/inc => }/tsdbUtil2.h (100%) diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt index 8c80fab076..6517e75241 100644 --- a/source/dnode/vnode/CMakeLists.txt +++ b/source/dnode/vnode/CMakeLists.txt @@ -35,23 +35,23 @@ set( "src/sma/smaSnapshot.c" "src/sma/smaTimeRange.c" - # tsdb - "src/tsdb/tsdbCommit.c" - "src/tsdb/tsdbFile.c" - "src/tsdb/tsdbFS.c" - "src/tsdb/tsdbOpen.c" - "src/tsdb/tsdbMemTable.c" - "src/tsdb/tsdbRead.c" - "src/tsdb/tsdbCache.c" - "src/tsdb/tsdbWrite.c" - "src/tsdb/tsdbReaderWriter.c" - "src/tsdb/tsdbUtil.c" - "src/tsdb/tsdbSnapshot.c" - "src/tsdb/tsdbCacheRead.c" - "src/tsdb/tsdbRetention.c" - "src/tsdb/tsdbDiskData.c" - "src/tsdb/tsdbMergeTree.c" - "src/tsdb/tsdbDataIter.c" + # # tsdb + # "src/tsdb/tsdbCommit.c" + # "src/tsdb/tsdbFile.c" + # "src/tsdb/tsdbFS.c" + # "src/tsdb/tsdbOpen.c" + # "src/tsdb/tsdbMemTable.c" + # "src/tsdb/tsdbRead.c" + # "src/tsdb/tsdbCache.c" + # "src/tsdb/tsdbWrite.c" + # "src/tsdb/tsdbReaderWriter.c" + # "src/tsdb/tsdbUtil.c" + # "src/tsdb/tsdbSnapshot.c" + # "src/tsdb/tsdbCacheRead.c" + # "src/tsdb/tsdbRetention.c" + # "src/tsdb/tsdbDiskData.c" + # "src/tsdb/tsdbMergeTree.c" + # "src/tsdb/tsdbDataIter.c" # tq "src/tq/tq.c" @@ -68,14 +68,12 @@ set( "src/tq/tqOffsetSnapshot.c" ) -if (USE_DEV_CODE) - aux_source_directory("src/tsdb/dev" VNODE_SOURCE_DEV_FILES) - list( - APPEND - VNODE_SOURCE_FILES - ${VNODE_SOURCE_DEV_FILES} - ) -endif(USE_DEV_CODE) +aux_source_directory("src/tsdb/" TSDB_SOURCE_FILES) +list( + APPEND + VNODE_SOURCE_FILES + ${TSDB_SOURCE_FILES} +) target_sources( vnode diff --git a/source/dnode/vnode/src/tsdb/dev/dev.h b/source/dnode/vnode/src/tsdb/dev/dev.h deleted file mode 100644 index dae993d294..0000000000 --- a/source/dnode/vnode/src/tsdb/dev/dev.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 _TSDB_DEV_H -#define _TSDB_DEV_H - -#include "tsdb.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#include "inc/tsdbUtil2.h" - -#include "inc/tsdbFile2.h" - -#include "inc/tsdbFSet2.h" - -#include "inc/tsdbFS2.h" - -#include "inc/tsdbSttFileRW.h" - -#include "inc/tsdbDataFileRW.h" - -#ifdef __cplusplus -} -#endif - -#endif /*_TSDB_DEV_H*/ \ No newline at end of file diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c b/source/dnode/vnode/src/tsdb/tsdbCommit2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c rename to source/dnode/vnode/src/tsdb/tsdbCommit2.c index 29b8fa9983..9cd18078d4 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c +++ b/source/dnode/vnode/src/tsdb/tsdbCommit2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbCommit2.h" +#include "tsdbCommit2.h" // extern dependencies typedef struct { diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit2.h b/source/dnode/vnode/src/tsdb/tsdbCommit2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit2.h rename to source/dnode/vnode/src/tsdb/tsdbCommit2.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c rename to source/dnode/vnode/src/tsdb/tsdbDataFileRW.c index b6f41f8fcc..33bd7c4cc6 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbDataFileRW.c +++ b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbDataFileRW.h" +#include "tsdbDataFileRW.h" typedef struct { SFDataPtr brinBlkPtr[1]; diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h b/source/dnode/vnode/src/tsdb/tsdbDataFileRW.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h rename to source/dnode/vnode/src/tsdb/tsdbDataFileRW.h diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h b/source/dnode/vnode/src/tsdb/tsdbDef.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbDef.h rename to source/dnode/vnode/src/tsdb/tsdbDef.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFS2.c b/source/dnode/vnode/src/tsdb/tsdbFS2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbFS2.c rename to source/dnode/vnode/src/tsdb/tsdbFS2.c index b54c15d076..30ce2c2256 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFS2.c +++ b/source/dnode/vnode/src/tsdb/tsdbFS2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbFS2.h" +#include "tsdbFS2.h" extern int vnodeScheduleTask(int (*execute)(void *), void *arg); extern int vnodeScheduleTaskEx(int tpid, int (*execute)(void *), void *arg); diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS2.h b/source/dnode/vnode/src/tsdb/tsdbFS2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbFS2.h rename to source/dnode/vnode/src/tsdb/tsdbFS2.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFSet2.c b/source/dnode/vnode/src/tsdb/tsdbFSet2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbFSet2.c rename to source/dnode/vnode/src/tsdb/tsdbFSet2.c index ef770d0be5..ed908d0b15 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFSet2.c +++ b/source/dnode/vnode/src/tsdb/tsdbFSet2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbFSet2.h" +#include "tsdbFSet2.h" static int32_t tsdbSttLvlInit(int32_t level, SSttLvl **lvl) { if (!(lvl[0] = taosMemoryMalloc(sizeof(SSttLvl)))) return TSDB_CODE_OUT_OF_MEMORY; diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet2.h b/source/dnode/vnode/src/tsdb/tsdbFSet2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet2.h rename to source/dnode/vnode/src/tsdb/tsdbFSet2.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFile2.c b/source/dnode/vnode/src/tsdb/tsdbFile2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbFile2.c rename to source/dnode/vnode/src/tsdb/tsdbFile2.c index 6bddf47970..96bfcbb1dd 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFile2.c +++ b/source/dnode/vnode/src/tsdb/tsdbFile2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbFile2.h" +#include "tsdbFile2.h" // to_json static int32_t head_to_json(const STFile *file, cJSON *json); diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFile2.h b/source/dnode/vnode/src/tsdb/tsdbFile2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbFile2.h rename to source/dnode/vnode/src/tsdb/tsdbFile2.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbIter.c b/source/dnode/vnode/src/tsdb/tsdbIter.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbIter.c rename to source/dnode/vnode/src/tsdb/tsdbIter.c index 2d6bfeebdb..f4296fb34f 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbIter.c +++ b/source/dnode/vnode/src/tsdb/tsdbIter.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbIter.h" +#include "tsdbIter.h" // STsdbIter ================ struct STsdbIter { diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbIter.h b/source/dnode/vnode/src/tsdb/tsdbIter.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbIter.h rename to source/dnode/vnode/src/tsdb/tsdbIter.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c b/source/dnode/vnode/src/tsdb/tsdbMerge.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbMerge.c rename to source/dnode/vnode/src/tsdb/tsdbMerge.c index 520c3fa610..d1f244d016 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbMerge.c +++ b/source/dnode/vnode/src/tsdb/tsdbMerge.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbMerge.h" +#include "tsdbMerge.h" typedef struct { STsdb *tsdb; diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h b/source/dnode/vnode/src/tsdb/tsdbMerge.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h rename to source/dnode/vnode/src/tsdb/tsdbMerge.h diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c index eb145ff8ce..ae75b31da1 100644 --- a/source/dnode/vnode/src/tsdb/tsdbOpen.c +++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c @@ -15,7 +15,7 @@ #include "tsdb.h" #ifdef USE_DEV_CODE -#include "dev/dev.h" +#include "tsdbFS2.h" #endif int32_t tsdbSetKeepCfg(STsdb *pTsdb, STsdbCfg *pCfg) { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c b/source/dnode/vnode/src/tsdb/tsdbSttFileRW.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c rename to source/dnode/vnode/src/tsdb/tsdbSttFileRW.c index 8fc627d618..683aa1d36f 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFileRW.c +++ b/source/dnode/vnode/src/tsdb/tsdbSttFileRW.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbSttFileRW.h" +#include "tsdbSttFileRW.h" typedef struct { int64_t prevFooter; diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h b/source/dnode/vnode/src/tsdb/tsdbSttFileRW.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h rename to source/dnode/vnode/src/tsdb/tsdbSttFileRW.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbUtil2.c b/source/dnode/vnode/src/tsdb/tsdbUtil2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbUtil2.c rename to source/dnode/vnode/src/tsdb/tsdbUtil2.c index 3a9dc5aeb7..e938caa118 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbUtil2.c +++ b/source/dnode/vnode/src/tsdb/tsdbUtil2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "dev.h" +#include "tsdbUtil2.h" // SDelBlock ---------- int32_t tTombBlockInit(STombBlock *tombBlock) { diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil2.h b/source/dnode/vnode/src/tsdb/tsdbUtil2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil2.h rename to source/dnode/vnode/src/tsdb/tsdbUtil2.h