From 735e6c1ea1720e0cd0f8156be797bfd48e050775 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Thu, 12 Aug 2021 11:53:53 +0800
Subject: [PATCH] fix: fix odr violation

---
 src/common/src/tglobal.c | 3 +++
 src/tsdb/inc/tsdbFS.h    | 5 ++++-
 src/tsdb/src/tsdbFS.c    | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index a58303e9fc..b9a4f4ffea 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -26,6 +26,9 @@
 #include "tlocale.h"
 #include "ttimezone.h"
 
+// TSDB
+bool tsdbForceKeepFile = false;
+
 // cluster
 char     tsFirst[TSDB_EP_LEN] = {0};
 char     tsSecond[TSDB_EP_LEN] = {0};
diff --git a/src/tsdb/inc/tsdbFS.h b/src/tsdb/inc/tsdbFS.h
index d63aeb14ac..55db8d56ff 100644
--- a/src/tsdb/inc/tsdbFS.h
+++ b/src/tsdb/inc/tsdbFS.h
@@ -18,6 +18,9 @@
 
 #define TSDB_FS_VERSION 0
 
+// ================== TSDB global config
+extern bool tsdbForceKeepFile;
+
 // ================== CURRENT file header info
 typedef struct {
   uint32_t version;  // Current file system version (relating to code)
@@ -109,4 +112,4 @@ static FORCE_INLINE int tsdbUnLockFS(STsdbFS* pFs) {
   return 0;
 }
 
-#endif /* _TD_TSDB_FS_H_ */
\ No newline at end of file
+#endif /* _TD_TSDB_FS_H_ */
diff --git a/src/tsdb/src/tsdbFS.c b/src/tsdb/src/tsdbFS.c
index 68450301d8..70a5262138 100644
--- a/src/tsdb/src/tsdbFS.c
+++ b/src/tsdb/src/tsdbFS.c
@@ -38,7 +38,6 @@ static int  tsdbProcessExpiredFS(STsdbRepo *pRepo);
 static int  tsdbCreateMeta(STsdbRepo *pRepo);
 
 // For backward compatibility
-bool tsdbForceKeepFile = false;
 // ================== CURRENT file header info
 static int tsdbEncodeFSHeader(void **buf, SFSHeader *pHeader) {
   int tlen = 0;
@@ -1354,4 +1353,4 @@ static void tsdbScanAndTryFixDFilesHeader(STsdbRepo *pRepo, int32_t *nExpired) {
 
     tsdbCloseDFileSet(&fset);
   }
-}
\ No newline at end of file
+}
-- 
GitLab