From 5bacfb4f94a0de19a706a4e3835a21e6069dcc3c Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Wed, 14 Jun 2023 13:38:51 +0800 Subject: [PATCH] refact code --- source/dnode/vnode/src/tsdb/dev/dev.h | 8 ++++---- .../src/tsdb/dev/inc/{tsdbCommit.h => tsdbCommit2.h} | 2 +- source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h | 4 ++-- .../dnode/vnode/src/tsdb/dev/inc/{tsdbFS.h => tsdbFS2.h} | 2 +- .../vnode/src/tsdb/dev/inc/{tsdbFSet.h => tsdbFSet2.h} | 2 +- .../vnode/src/tsdb/dev/inc/{tsdbFile.h => tsdbFile2.h} | 0 source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h | 4 ++-- source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h | 4 ++-- .../vnode/src/tsdb/dev/inc/{tsdbUtil.h => tsdbUtil2.h} | 0 .../vnode/src/tsdb/dev/{tsdbCommit.c => tsdbCommit2.c} | 2 +- source/dnode/vnode/src/tsdb/dev/{tsdbFS.c => tsdbFS2.c} | 2 +- .../dnode/vnode/src/tsdb/dev/{tsdbFSet.c => tsdbFSet2.c} | 2 +- .../dnode/vnode/src/tsdb/dev/{tsdbFile.c => tsdbFile2.c} | 2 +- .../dnode/vnode/src/tsdb/dev/{tsdbUtil.c => tsdbUtil2.c} | 0 14 files changed, 17 insertions(+), 17 deletions(-) rename source/dnode/vnode/src/tsdb/dev/inc/{tsdbCommit.h => tsdbCommit2.h} (97%) rename source/dnode/vnode/src/tsdb/dev/inc/{tsdbFS.h => tsdbFS2.h} (98%) rename source/dnode/vnode/src/tsdb/dev/inc/{tsdbFSet.h => tsdbFSet2.h} (99%) rename source/dnode/vnode/src/tsdb/dev/inc/{tsdbFile.h => tsdbFile2.h} (100%) rename source/dnode/vnode/src/tsdb/dev/inc/{tsdbUtil.h => tsdbUtil2.h} (100%) rename source/dnode/vnode/src/tsdb/dev/{tsdbCommit.c => tsdbCommit2.c} (99%) rename source/dnode/vnode/src/tsdb/dev/{tsdbFS.c => tsdbFS2.c} (99%) rename source/dnode/vnode/src/tsdb/dev/{tsdbFSet.c => tsdbFSet2.c} (99%) rename source/dnode/vnode/src/tsdb/dev/{tsdbFile.c => tsdbFile2.c} (99%) rename source/dnode/vnode/src/tsdb/dev/{tsdbUtil.c => tsdbUtil2.c} (100%) diff --git a/source/dnode/vnode/src/tsdb/dev/dev.h b/source/dnode/vnode/src/tsdb/dev/dev.h index fc3761c5ad..dae993d294 100644 --- a/source/dnode/vnode/src/tsdb/dev/dev.h +++ b/source/dnode/vnode/src/tsdb/dev/dev.h @@ -22,13 +22,13 @@ extern "C" { #endif -#include "inc/tsdbUtil.h" +#include "inc/tsdbUtil2.h" -#include "inc/tsdbFile.h" +#include "inc/tsdbFile2.h" -#include "inc/tsdbFSet.h" +#include "inc/tsdbFSet2.h" -#include "inc/tsdbFS.h" +#include "inc/tsdbFS2.h" #include "inc/tsdbSttFileRW.h" diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit2.h similarity index 97% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit2.h index ad60b52824..72d7eb48ee 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbCommit2.h @@ -14,7 +14,7 @@ */ #include "tsdbDataFileRW.h" -#include "tsdbFS.h" +#include "tsdbFS2.h" #include "tsdbIter.h" #include "tsdbSttFileRW.h" diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h index edb0a91900..bd89cd7e2d 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbDataFileRW.h @@ -14,9 +14,9 @@ */ #include "tsdbDef.h" -#include "tsdbFSet.h" +#include "tsdbFSet2.h" #include "tsdbSttFileRW.h" -#include "tsdbUtil.h" +#include "tsdbUtil2.h" #ifndef _TSDB_DATA_FILE_RW_H #define _TSDB_DATA_FILE_RW_H diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS2.h similarity index 98% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbFS.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbFS2.h index e04404ec8f..e16ca5cee6 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFS2.h @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "tsdbFSet.h" +#include "tsdbFSet2.h" #ifndef _TSDB_FILE_SYSTEM_H #define _TSDB_FILE_SYSTEM_H diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet2.h similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet2.h index a0811d8207..e289c4484d 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFSet2.h @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "tsdbFile.h" +#include "tsdbFile2.h" #ifndef _TSDB_FILE_SET_H #define _TSDB_FILE_SET_H diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbFile.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbFile2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbFile.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbFile2.h diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h index 9fe7f3d9b7..e4c7aef614 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbMerge.h @@ -14,10 +14,10 @@ */ #include "tsdbDataFileRW.h" -#include "tsdbFS.h" +#include "tsdbFS2.h" #include "tsdbIter.h" #include "tsdbSttFileRW.h" -#include "tsdbUtil.h" +#include "tsdbUtil2.h" #ifndef _TD_TSDB_MERGE_H_ #define _TD_TSDB_MERGE_H_ diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h index b37330e8ee..fdea7527f5 100644 --- a/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h +++ b/source/dnode/vnode/src/tsdb/dev/inc/tsdbSttFileRW.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#include "tsdbFS.h" -#include "tsdbUtil.h" +#include "tsdbFS2.h" +#include "tsdbUtil2.h" #ifndef _TSDB_STT_FILE_RW_H #define _TSDB_STT_FILE_RW_H diff --git a/source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil.h b/source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil2.h similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil.h rename to source/dnode/vnode/src/tsdb/dev/inc/tsdbUtil2.h diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbCommit.c b/source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbCommit.c rename to source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c index 718e5024a1..29b8fa9983 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbCommit.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbCommit2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbCommit.h" +#include "inc/tsdbCommit2.h" // extern dependencies typedef struct { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbFS.c b/source/dnode/vnode/src/tsdb/dev/tsdbFS2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbFS.c rename to source/dnode/vnode/src/tsdb/dev/tsdbFS2.c index 72f10743e6..b54c15d076 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFS.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbFS2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbFS.h" +#include "inc/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/tsdbFSet.c b/source/dnode/vnode/src/tsdb/dev/tsdbFSet2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbFSet.c rename to source/dnode/vnode/src/tsdb/dev/tsdbFSet2.c index c2bae718e7..ef770d0be5 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFSet.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbFSet2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbFSet.h" +#include "inc/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/tsdbFile.c b/source/dnode/vnode/src/tsdb/dev/tsdbFile2.c similarity index 99% rename from source/dnode/vnode/src/tsdb/dev/tsdbFile.c rename to source/dnode/vnode/src/tsdb/dev/tsdbFile2.c index 1c99cafeb9..6bddf47970 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbFile.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbFile2.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ -#include "inc/tsdbFile.h" +#include "inc/tsdbFile2.h" // to_json static int32_t head_to_json(const STFile *file, cJSON *json); diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbUtil.c b/source/dnode/vnode/src/tsdb/dev/tsdbUtil2.c similarity index 100% rename from source/dnode/vnode/src/tsdb/dev/tsdbUtil.c rename to source/dnode/vnode/src/tsdb/dev/tsdbUtil2.c