From 3286ab2a9eaf023c65f26d5da48dccd6dd65d750 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 2 Sep 2022 10:09:38 +0800
Subject: [PATCH] refact

---
 source/common/src/tglobal.c       |  4 ----
 source/dnode/vnode/src/inc/tsdb.h | 23 +++++++++--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 908f7c014e..c436e4ffd2 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -129,10 +129,6 @@ int32_t tsMinIntervalTime = 1;
 int32_t tsQueryBufferSize = -1;
 int64_t tsQueryBufferSizeBytes = -1;
 
-// tsdb config
-// For backward compatibility
-bool tsdbForceKeepFile = false;
-
 int32_t  tsDiskCfgNum = 0;
 SDiskCfg tsDiskCfg[TFS_MAX_DISKS] = {0};
 
diff --git a/source/dnode/vnode/src/inc/tsdb.h b/source/dnode/vnode/src/inc/tsdb.h
index 111c6b5962..28e82d5be0 100644
--- a/source/dnode/vnode/src/inc/tsdb.h
+++ b/source/dnode/vnode/src/inc/tsdb.h
@@ -478,12 +478,6 @@ struct SBlockData {
   SArray  *aColData;  // SArray<SColData>
 };
 
-// ================== TSDB global config
-extern bool tsdbForceKeepFile;
-
-#define TSDB_FS_ITER_FORWARD  TSDB_ORDER_ASC
-#define TSDB_FS_ITER_BACKWARD TSDB_ORDER_DESC
-
 struct TABLEID {
   tb_uid_t suid;
   tb_uid_t uid;
@@ -633,17 +627,18 @@ typedef struct {
 } SRowInfo;
 
 typedef struct SMergeTree {
-  int8_t       backward;
-  SRBTree      rbt;
-  SArray      *pIterList;
-  struct SLDataIter  *pIter;
+  int8_t             backward;
+  SRBTree            rbt;
+  SArray            *pIterList;
+  struct SLDataIter *pIter;
 } SMergeTree;
 
-void tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader* pFReader, uint64_t uid, STimeWindow* pTimeWindow, SVersionRange* pVerRange);
+void tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFReader, uint64_t uid, STimeWindow *pTimeWindow,
+                    SVersionRange *pVerRange);
 void tMergeTreeAddIter(SMergeTree *pMTree, struct SLDataIter *pIter);
-bool tMergeTreeNext(SMergeTree* pMTree);
-TSDBROW tMergeTreeGetRow(SMergeTree* pMTree);
-void tMergeTreeClose(SMergeTree* pMTree);
+bool tMergeTreeNext(SMergeTree *pMTree);
+TSDBROW tMergeTreeGetRow(SMergeTree *pMTree);
+void    tMergeTreeClose(SMergeTree *pMTree);
 
 // ========== inline functions ==========
 static FORCE_INLINE int32_t tsdbKeyCmprFn(const void *p1, const void *p2) {
-- 
GitLab