From 0fc1eadeedeb236f4bd82efa90323bb7ce82ba2d Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Fri, 19 May 2023 06:52:07 +0800
Subject: [PATCH] chore: revert

---
 include/common/tglobal.h    |  4 ----
 source/common/src/tglobal.c | 19 -------------------
 2 files changed, 23 deletions(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index c16d82d801..8509d39793 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -77,10 +77,6 @@ extern int32_t tsElectInterval;
 extern int32_t tsHeartbeatInterval;
 extern int32_t tsHeartbeatTimeout;
 
-// dnode
-extern char tsActive[];
-extern char tsConnActive[];
-
 // vnode
 extern int64_t tsVndCommitMaxIntervalMs;
 
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 699b6f6428..237a52efe5 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -66,10 +66,6 @@ int32_t tsElectInterval = 25 * 1000;
 int32_t tsHeartbeatInterval = 1000;
 int32_t tsHeartbeatTimeout = 20 * 1000;
 
-// dnode
-char tsActive[TSDB_ACTIVE_KEY_LEN] = {0};
-char tsConnActive[TSDB_CONN_ACTIVE_KEY_LEN] = {0};
-
 // vnode
 int64_t tsVndCommitMaxIntervalMs = 600 * 1000;
 
@@ -494,9 +490,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddInt64(pCfg, "mndSdbWriteDelta", tsMndSdbWriteDelta, 20, 10000, 0) != 0) return -1;
   if (cfgAddInt64(pCfg, "mndLogRetention", tsMndLogRetention, 500, 10000, 0) != 0) return -1;
 
-  if (cfgAddString(pCfg, "activeCode", tsActive, 0) != 0) return -1;
-  if (cfgAddString(pCfg, "cActiveCode", tsConnActive, 0) != 0) return -1;
-
   if (cfgAddBool(pCfg, "monitor", tsEnableMonitor, 0) != 0) return -1;
   if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 200000, 0) != 0) return -1;
   if (cfgAddString(pCfg, "monitorFqdn", tsMonitorFqdn, 0) != 0) return -1;
@@ -892,9 +885,6 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
   tsMndSdbWriteDelta = cfgGetItem(pCfg, "mndSdbWriteDelta")->i64;
   tsMndLogRetention = cfgGetItem(pCfg, "mndLogRetention")->i64;
 
-  tstrncpy(tsActive, cfgGetItem(pCfg, "activeCode")->str, sizeof(tsActive));
-  tstrncpy(tsConnActive, cfgGetItem(pCfg, "cActiveCode")->str, sizeof(tsConnActive));
-
   tsStartUdfd = cfgGetItem(pCfg, "udf")->bval;
   tstrncpy(tsUdfdResFuncs, cfgGetItem(pCfg, "udfdResFuncs")->str, sizeof(tsUdfdResFuncs));
   tstrncpy(tsUdfdLdLibPath, cfgGetItem(pCfg, "udfdLdLibPath")->str, sizeof(tsUdfdLdLibPath));
@@ -937,10 +927,6 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
         tsAsyncLog = cfgGetItem(pCfg, "asyncLog")->bval;
       } else if (strcasecmp("assert", name) == 0) {
         tsAssert = cfgGetItem(pCfg, "assert")->bval;
-      } else if (strcasecmp("activeCode", name) == 0) {
-        SConfigItem *pActiveItem = cfgGetItem(pCfg, "activeCode");
-        snprintf(tsActive, sizeof(tsActive), "%s", pActiveItem->str);
-        cfgSetItem(pCfg, "activeCode", tsActive, pActiveItem->stype);
       }
       break;
     }
@@ -960,12 +946,7 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
         cDebugFlag = cfgGetItem(pCfg, "cDebugFlag")->i32;
       } else if (strcasecmp("crashReporting", name) == 0) {
         tsEnableCrashReport = cfgGetItem(pCfg, "crashReporting")->bval;
-      } else if (strcasecmp("cActiveCode", name) == 0) {
-        SConfigItem *pActiveItem = cfgGetItem(pCfg, "cActiveCode");
-        snprintf(tsConnActive, sizeof(tsConnActive), "%s", pActiveItem->str);
-        cfgSetItem(pCfg, "cActiveCode", tsActive, pActiveItem->stype);
       }
-
       break;
     }
     case 'd': {
-- 
GitLab