From e7bf159174516f66e18f7339a98294a5ce5c61ca Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Wed, 8 Nov 2023 16:56:05 +0800
Subject: [PATCH] fix:compile error

---
 source/common/src/cos.c     | 1 +
 source/common/src/tglobal.c | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/common/src/cos.c b/source/common/src/cos.c
index ebe3a6d7cd..daeb81b8a3 100644
--- a/source/common/src/cos.c
+++ b/source/common/src/cos.c
@@ -1314,6 +1314,7 @@ void    s3DeleteObjectsByPrefix(const char *prefix) {}
 void    s3DeleteObjects(const char *object_name[], int nobject) {}
 bool    s3Exists(const char *object_name) { return false; }
 bool    s3Get(const char *object_name, const char *path) { return false; }
+int32_t s3GetObjectsByPrefix(const char *prefix, const char* path) { return 0; }
 int32_t s3GetObjectBlock(const char *object_name, int64_t offset, int64_t size, uint8_t **ppBlock) { return 0; }
 void    s3EvictCache(const char *path, long object_size) {}
 long    s3Size(const char *object_name) { return 0; }
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 2b587b147e..d441b22aa3 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -672,8 +672,8 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddString(pCfg, "telemetryServer", tsTelemServer, CFG_SCOPE_BOTH, CFG_DYN_BOTH) != 0) return -1;
   if (cfgAddInt32(pCfg, "telemetryPort", tsTelemPort, 1, 65056, CFG_SCOPE_BOTH, CFG_DYN_NONE) != 0) return -1;
 
-  if (cfgAddInt32(pCfg, "snodeRsyncPort", tsRsyncPort, 1, 65535, CFG_SCOPE_BOTH, CFG_DYN_SERVER) != 0) return -1;
-  if (cfgAddString(pCfg, "snodeRsyncAddress", tsSnodeAddress, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
+  if (cfgAddInt32(pCfg, "rsyncPort", tsRsyncPort, 1, 65535, CFG_SCOPE_BOTH, CFG_DYN_SERVER) != 0) return -1;
+  if (cfgAddString(pCfg, "snodeAddress", tsSnodeAddress, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
   if (cfgAddString(pCfg, "checkpointBackupDir", tsCheckpointBackupDir, CFG_SCOPE_SERVER, CFG_DYN_SERVER) != 0) return -1;
 
   if (cfgAddInt32(pCfg, "tmqMaxTopicNum", tmqMaxTopicNum, 1, 10000, CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER) != 0)
@@ -1592,9 +1592,6 @@ int32_t taosInitCfg(const char *cfgDir, const char **envCmd, const char *envFile
     return -1;
   }
 
-  if (taosSetS3Cfg(tsCfg) != 0) return -1;
-  return 0;
-
   if (tsc) {
     if (taosSetClientCfg(tsCfg)) return -1;
   } else {