Merge pull request #10382 from taosdata/feature/config

config

include/common/tglobal.h

@@ -23,11 +23,9 @@ extern "C" {
 #include "tdef.h"
 
 // common
-extern int8_t   tsDaylight;
 extern int32_t  tsCompressMsgSize;
 extern int32_t  tsCompressColData;
 extern int32_t  tsMaxNumOfDistinctResults;
-extern char     tsTempDir[];
 extern int      tsCompatibleModel;  // 2.0 compatible model
 extern int8_t   tsEnableSlaveQuery;
 extern int8_t   tsEnableAdjustMaster;

include/common/tmsg.h

@@ -656,9 +656,9 @@ int32_t tDeserializeSRetrieveFuncRsp(void* buf, int32_t bufLen, SRetrieveFuncRsp
 typedef struct {
   int32_t statusInterval;
   int64_t checkTime;                    // 1970-01-01 00:00:00.000
-  char    timezone[TSDB_TIMEZONE_LEN];  // tsTimezone
-  char    locale[TSDB_LOCALE_LEN];      // tsLocale
-  char    charset[TSDB_LOCALE_LEN];     // tsCharset
+  char    timezone[TD_TIMEZONE_LEN];  // tsTimezone
+  char    locale[TD_LOCALE_LEN];      // tsLocale
+  char    charset[TD_LOCALE_LEN];     // tsCharset
 } SClusterCfg;
 
 typedef struct {

include/dnode/mgmt/dnode.h

@@ -34,9 +34,9 @@ typedef struct {
   bool     printAuth;
   int32_t  rpcTimer;
   int32_t  rpcMaxTime;
-  char     timezone[TSDB_TIMEZONE_LEN];
-  char     locale[TSDB_LOCALE_LEN];
-  char     charset[TSDB_LOCALE_LEN];
+  char     timezone[TD_TIMEZONE_LEN];
+  char     locale[TD_LOCALE_LEN];
+  char     charset[TD_LOCALE_LEN];
   char     buildinfo[64];
   char     gitinfo[48];
 } SDnodeEnvCfg;

include/libs/config/config.h

@@ -80,6 +80,7 @@ int32_t      cfgGetSize(SConfig *pCfg);
 SConfigItem *cfgIterate(SConfig *pCfg, SConfigItem *pIter);
 void         cfgCancelIterate(SConfig *pCfg, SConfigItem *pIter);
 SConfigItem *cfgGetItem(SConfig *pCfg, const char *name);
+int32_t      cfgSetItem(SConfig *pCfg, const char *name, const char *value, ECfgSrcType stype);
 
 int32_t cfgAddBool(SConfig *pCfg, const char *name, bool defaultVal);
 int32_t cfgAddInt32(SConfig *pCfg, const char *name, int32_t defaultVal, int64_t minval, int64_t maxval);

include/os/os.h

@@ -59,6 +59,7 @@ extern "C" {
 #include "osEndian.h"
 #include "osEnv.h"
 #include "osFile.h"
+#include "osLocale.h"
 #include "osLz4.h"
 #include "osMath.h"
 #include "osMemory.h"
@@ -73,6 +74,7 @@ extern "C" {
 #include "osThread.h"
 #include "osTime.h"
 #include "osTimer.h"
+#include "osTimezone.h"
 
 void osInit();
 

include/os/osDir.h

@@ -23,7 +23,7 @@ extern "C" {
 void    taosRemoveDir(const char *dirname);
 int32_t taosDirExist(char *dirname);
 int32_t taosMkDir(const char *dirname);
-void    taosRemoveOldFiles(char *dirname, int32_t keepDays);
+void    taosRemoveOldFiles(const char *dirname, int32_t keepDays);
 int32_t taosExpandDir(const char *dirname, char *outname, int32_t maxlen);
 int32_t taosRealPath(char *dirname, int32_t maxlen);
 

include/os/osEnv.h

@@ -16,28 +16,37 @@
 #ifndef _TD_OS_ENV_H_
 #define _TD_OS_ENV_H_
 
+#include "osSysinfo.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern char tsOsName[];
+typedef struct SOsEnv SOsEnv;
 
-extern char tsDataDir[];
-extern char tsLogDir[];
-extern char tsTempDir[];
 extern char configDir[];
 
-extern struct SDiskSpace tsLogSpace;
-extern struct SDiskSpace tsTempSpace;
-extern struct SDiskSpace tsDataSpace;
-
-void taosUpdateLogSpace();
-void taosUpdateTempSpace();
-void taosUpdateDataSpace();
-bool taosLogSpaceAvailable();
-bool taosTmpSpaceAvailable();
-bool taosDataSpaceAvailable();
-void taosUpdateAllSpace();
+void osInit();
+void osUpdate();
+
+bool   osLogSpaceAvailable();
+int8_t osDaylight();
+
+const char *osLogDir();
+const char *osTempDir();
+const char *osDataDir();
+const char *osName();
+const char *osTimezone();
+const char *osLocale();
+const char *osCharset();
+
+void osSetLogDir(const char *logDir);
+void osSetTempDir(const char *tempDir);
+void osSetDataDir(const char *dataDir);
+void osSetLogReservedSpace(float sizeInGB);
+void osSetTempReservedSpace(float sizeInGB);
+void osSetDataReservedSpace(float sizeInGB);
+void osSetTimezone(const char *timezone);
 
 #ifdef __cplusplus
 }

include/common/ttimezone.h → include/os/osLocale.h

@@ -13,17 +13,22 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_COMMON_TIMEZONE_H_
-#define _TD_COMMON_TIMEZONE_H_
+#ifndef _TD_OS_LOCALE_H_
+#define _TD_OS_LOCALE_H_
+
+#include "os.h"
+#include "osString.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void tsSetTimeZone();
+char *taosCharsetReplace(char *charsetstr);
+void  taosGetSystemLocale(char *outLocale, char *outCharset);
+void  taosSetSystemLocale(const char *inLocale, const char *inCharSet);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_COMMON_TIMEZONE_H_*/
+#endif /*_TD_OS_LOCALE_H_*/

include/os/osString.h

@@ -45,7 +45,6 @@ int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs);
 bool    taosMbsToUcs4(const char *mbs, size_t mbs_len, char *ucs4, int32_t ucs4_max_len, int32_t *len);
 int32_t tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int32_t bytes, int8_t ncharSize);
 bool    taosValidateEncodec(const char *encodec);
-char *  taosCharsetReplace(char *charsetstr);
 
 #ifdef __cplusplus
 }

include/os/osSysinfo.h

@@ -22,8 +22,9 @@ extern "C" {
 
 #include "os.h"
 
-#define TSDB_LOCALE_LEN   64
-#define TSDB_TIMEZONE_LEN 96
+#define TD_LOCALE_LEN   64
+#define TD_CHARSET_LEN  64
+#define TD_TIMEZONE_LEN 96
 
 typedef struct {
   int64_t total;
@@ -41,9 +42,6 @@ extern int64_t tsOpenMax;
 extern int64_t tsStreamMax;
 extern int32_t tsNumOfCores;
 extern int32_t tsTotalMemoryMB;
-extern char    tsTimezone[];
-extern char    tsLocale[];
-extern char    tsCharset[];  // default encode string
 
 
 

include/common/tlocale.h → include/os/osTimezone.h

@@ -13,17 +13,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_COMMON_LOCALE_H_
-#define _TD_COMMON_LOCALE_H_
+#ifndef _TD_OS_TIMEZONE_H_
+#define _TD_OS_TIMEZONE_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void tsSetLocale();
+void taosGetSystemTimezone(char *outTimezone);
+void taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight);
 
 #ifdef __cplusplus
 }
-#endif /*_TD_COMMON_LOCALE_H_*/
-
 #endif
+
+#endif /*_TD_OS_TIMEZONE_H_*/

source/client/src/clientCfg.c

@@ -67,7 +67,7 @@ static int32_t tscAddLogCfg(SConfig *pCfg) {
 }
 
 static int32_t tscSetLogCfg(SConfig *pCfg) {
-  tstrncpy(tsLogDir, cfgGetItem(pCfg, "logDir")->str, PATH_MAX);
+  osSetLogDir(cfgGetItem(pCfg, "logDir")->str);
   tsAsyncLog = cfgGetItem(pCfg, "asyncLog")->bval;
   tsNumOfLogLines = cfgGetItem(pCfg, "numOfLogLines")->i32;
   tsLogKeepDays = cfgGetItem(pCfg, "logKeepDays")->i32;
@@ -146,7 +146,7 @@ static int32_t tscAddCfg(SConfig *pCfg) {
   // if (cfgAddString(pCfg, "gitinfo", gitinfo) != 0) return -1;
   // if (cfgAddString(pCfg, "version", version) != 0) return -1;
 
-  // if (cfgAddDir(pCfg, "dataDir", tsDataDir) != 0) return -1;
+  // if (cfgAddDir(pCfg, "dataDir", osDataDir()) != 0) return -1;
   if (cfgAddTimezone(pCfg, "timezone", "") != 0) return -1;
   if (cfgAddLocale(pCfg, "locale", "") != 0) return -1;
   if (cfgAddCharset(pCfg, "charset", "") != 0) return -1;

source/client/src/clientEnv.c

@@ -25,7 +25,6 @@
 #include "tref.h"
 #include "trpc.h"
 #include "ttime.h"
-#include "ttimezone.h"
 
 #define TSC_VAR_NOT_RELEASE 1
 #define TSC_VAR_RELEASED 0
@@ -300,7 +299,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
       assert(cfg != NULL);
 
       size_t len = strlen(str);
-      if (len == 0 || len > TSDB_LOCALE_LEN) {
+      if (len == 0 || len > TD_LOCALE_LEN) {
         tscInfo("Invalid locale:%s, use default", str);
         return -1;
       }
@@ -318,7 +317,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
             return -1;
           }
 
-          tstrncpy(tsLocale, defaultLocale, TSDB_LOCALE_LEN);
+          tstrncpy(tsLocale, defaultLocale, TD_LOCALE_LEN);
         }
 
         // set the user specified locale
@@ -332,7 +331,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
           tscInfo("failed to set locale:%s, current locale:%s", str, tsLocale);
         }
 
-        tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
+        tstrncpy(tsLocale, locale, TD_LOCALE_LEN);
 
         char *charset = strrchr(tsLocale, sep);
         if (charset != NULL) {
@@ -347,7 +346,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
               tscInfo("charset changed from %s to %s", tsCharset, charset);
             }
 
-            tstrncpy(tsCharset, charset, TSDB_LOCALE_LEN);
+            tstrncpy(tsCharset, charset, TD_LOCALE_LEN);
             cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
 
           } else {
@@ -371,7 +370,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
       assert(cfg != NULL);
 
       size_t len = strlen(str);
-      if (len == 0 || len > TSDB_LOCALE_LEN) {
+      if (len == 0 || len > TD_LOCALE_LEN) {
         tscInfo("failed to set charset:%s", str);
         return -1;
       }
@@ -384,7 +383,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
             tscInfo("charset changed from %s to %s", tsCharset, str);
           }
 
-          tstrncpy(tsCharset, str, TSDB_LOCALE_LEN);
+          tstrncpy(tsCharset, str, TD_LOCALE_LEN);
           cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
         } else {
           tscInfo("charset:%s not valid", str);
@@ -402,7 +401,7 @@ int taos_options_imp(TSDB_OPTION option, const char *str) {
       assert(cfg != NULL);
 
       if (cfg->cfgStatus <= TAOS_CFG_CSTATUS_OPTION) {
-        tstrncpy(tsTimezone, str, TSDB_TIMEZONE_LEN);
+        tstrncpy(tsTimezone, str, TD_TIMEZONE_LEN);
         tsSetTimeZone();
         cfg->cfgStatus = TAOS_CFG_CSTATUS_OPTION;
         tscDebug("timezone set:%s, input:%s by taos_options", tsTimezone, str);

source/common/src/tglobal.c

@@ -21,15 +21,12 @@
 #include "tcompare.h"
 #include "tep.h"
 #include "tglobal.h"
-#include "tlocale.h"
 #include "tlog.h"
-#include "ttimezone.h"
 #include "tutil.h"
 #include "ulog.h"
 
 
 // common
-int8_t  tsDaylight = 0;
 int32_t tsMaxBinaryDisplayWidth = 30;
 int8_t  tsEnableSlaveQuery = 1;
 int8_t  tsEnableAdjustMaster = 1;
@@ -235,7 +232,7 @@ static void doInitGlobalConfig(void) {
 
 
   cfg.option = "dataDir";
-  cfg.ptr = tsDataDir;
+  cfg.ptr = osDataDir();
   cfg.valType = TAOS_CFG_VTYPE_DATA_DIRCTORY;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
   cfg.minValue = 0;
@@ -419,7 +416,7 @@ static void doInitGlobalConfig(void) {
   taosAddConfigOption(cfg);
 
   cfg.option = "tempDir";
-  cfg.ptr = tsTempDir;
+  cfg.ptr = osTempDir();
   cfg.valType = TAOS_CFG_VTYPE_STRING;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;

source/common/src/tlocale.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-#include "ulog.h"
-#include "tglobal.h"
-#include "tutil.h"
-
-/**
- * In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
- * both the TDengine Server and the Client may be interrupted.
- *
- * In case that the setLocale failed to be executed, the right charset needs to be set.
- */
-void tsSetLocale() {
-  char *locale = setlocale(LC_CTYPE, tsLocale);
-
-  // default locale or user specified locale is not valid, abort launch
-  if (locale == NULL) {
-    uError("Invalid locale:%s, please set the valid locale in config file", tsLocale);
-  }
-
-  if (strlen(tsCharset) == 0) {
-    uError("failed to get charset, please set the valid charset in config file");
-    exit(-1);
-  }
-
-  if (!taosValidateEncodec(tsCharset)) {
-    uError("Invalid charset:%s, please set the valid charset in config file", tsCharset);
-    exit(-1);
-  }
-}
\ No newline at end of file

source/common/src/ttszip.c

@@ -23,7 +23,7 @@ STSBuf* tsBufCreate(bool autoDelete, int32_t order) {
 
   pTSBuf->autoDelete = autoDelete;
   
-  taosGetTmpfilePath(tsTempDir, "join", pTSBuf->path);
+  taosGetTmpfilePath(osTempDir(), "join", pTSBuf->path);
   pTSBuf->f = fopen(pTSBuf->path, "wb+");
   if (pTSBuf->f == NULL) {
     free(pTSBuf);

source/dnode/mgmt/daemon/src/dmnCfg.c

@@ -15,8 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "dmnInt.h"
-#include "tlocale.h"
-#include "ttimezone.h"
 
 static int32_t dmnAddEpCfg(SConfig *pCfg) {
   char defaultFqdn[TSDB_FQDN_LEN] = {0};
@@ -40,18 +38,18 @@ static int32_t dmnAddEpCfg(SConfig *pCfg) {
 }
 
 static int32_t dmnAddDirCfg(SConfig *pCfg) {
-  if (cfgAddDir(pCfg, "dataDir", tsDataDir) != 0) return -1;
-  if (cfgAddDir(pCfg, "tempDir", tsTempDir) != 0) return -1;
+  if (cfgAddDir(pCfg, "dataDir", osDataDir()) != 0) return -1;
+  if (cfgAddDir(pCfg, "tempDir", osTempDir()) != 0) return -1;
   if (cfgAddFloat(pCfg, "minimalDataDirGB", 2.0f, 0.001f, 10000000) != 0) return -1;
   if (cfgAddFloat(pCfg, "minimalTempDirGB", 1.0f, 0.001f, 10000000) != 0) return -1;
   return 0;
 }
 
 static int32_t dmnCheckDirCfg(SConfig *pCfg) {
-  tstrncpy(tsDataDir, cfgGetItem(pCfg, "dataDir")->str, PATH_MAX);
-  tstrncpy(tsTempDir, cfgGetItem(pCfg, "tempDir")->str, PATH_MAX);
-  tsDataSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval;
-  tsTempSpace.reserved = cfgGetItem(pCfg, "minimalTempDirGB")->fval;
+  osSetDataDir(cfgGetItem(pCfg, "dataDir")->str);
+  osSetTempDir(cfgGetItem(pCfg, "tempDir")->str);
+  osSetTempReservedSpace(cfgGetItem(pCfg, "minimalDataDirGB")->fval);
+  osSetDataReservedSpace(cfgGetItem(pCfg, "minimalTempDirGB")->fval);
   return 0;
 }
 
@@ -86,18 +84,25 @@ static int32_t dmnAddDnodeCfg(SConfig *pCfg) {
   return 0;
 }
 
+static void dmnSetDnodeCfg(SConfig *pCfg) {
+  SConfigItem *pItem = cfgGetItem(pCfg, "timezone");
+  osSetTimezone(pItem->str);
+  uDebug("timezone format changed from %s to %s", pItem->str, osTimezone());
+  cfgSetItem(pCfg, "timezone", osTimezone(), pItem->stype);
+}
+
 static int32_t dmnCheckCfg(SConfig *pCfg) {
   bool enableCore = cfgGetItem(pCfg, "enableCoreFile")->bval;
   taosSetCoreDump(enableCore);
 
+  dmnSetDnodeCfg(pCfg);
+
   if (dmnCheckDirCfg(pCfg) != 0) {
     return -1;
   }
 
   taosGetSystemInfo();
 
-  tsSetTimeZone();
-  tsSetLocale();
 
   if (tsNumOfCores <= 0) {
     tsNumOfCores = 1;

source/dnode/mgmt/daemon/src/dmnLog.c

@@ -17,7 +17,7 @@
 #include "dmnInt.h"
 
 int32_t dmnAddLogCfg(SConfig *pCfg) {
-  if (cfgAddDir(pCfg, "logDir", "/var/log/taos") != 0) return -1;
+  if (cfgAddDir(pCfg, "logDir", osLogDir()) != 0) return -1;
   if (cfgAddFloat(pCfg, "minimalLogDirGB", 1.0f, 0.001f, 10000000) != 0) return -1;
   if (cfgAddBool(pCfg, "asyncLog", 1) != 0) return -1;
   if (cfgAddInt32(pCfg, "numOfLogLines", 10000000, 1000, 2000000000) != 0) return -1;
@@ -41,8 +41,8 @@ int32_t dmnAddLogCfg(SConfig *pCfg) {
 }
 
 int32_t dmnSetLogCfg(SConfig *pCfg) {
-  tstrncpy(tsLogDir, cfgGetItem(pCfg, "logDir")->str, PATH_MAX);
-  tsLogSpace.reserved = cfgGetItem(pCfg, "minimalLogDirGB")->fval;
+  osSetLogDir(cfgGetItem(pCfg, "logDir")->str);
+  osSetLogReservedSpace(cfgGetItem(pCfg, "minimalLogDirGB")->fval);
   tsAsyncLog = cfgGetItem(pCfg, "asyncLog")->bval;
   tsNumOfLogLines = cfgGetItem(pCfg, "numOfLogLines")->i32;
   tsLogKeepDays = cfgGetItem(pCfg, "logKeepDays")->i32;

source/dnode/mgmt/daemon/src/dmnMain.c

@@ -97,6 +97,8 @@ int32_t dmnRunDnode(SConfig *pCfg) {
 }
 
 int main(int argc, char const *argv[]) {
+  osInit();
+
   if (dmnParseOption(argc, argv) != 0) {
     return -1;
   }

source/dnode/mgmt/impl/src/dndMgmt.c

@@ -371,9 +371,9 @@ void dndSendStatusReq(SDnode *pDnode) {
   req.clusterCfg.checkTime = 0;
   char timestr[32] = "1970-01-01 00:00:00.00";
   (void)taosParseTime(timestr, &req.clusterCfg.checkTime, (int32_t)strlen(timestr), TSDB_TIME_PRECISION_MILLI, 0);
-  memcpy(req.clusterCfg.timezone, pDnode->env.timezone, TSDB_TIMEZONE_LEN);
-  memcpy(req.clusterCfg.locale, pDnode->env.locale, TSDB_LOCALE_LEN);
-  memcpy(req.clusterCfg.charset, pDnode->env.charset, TSDB_LOCALE_LEN);
+  memcpy(req.clusterCfg.timezone, pDnode->env.timezone, TD_TIMEZONE_LEN);
+  memcpy(req.clusterCfg.locale, pDnode->env.locale, TD_LOCALE_LEN);
+  memcpy(req.clusterCfg.charset, pDnode->env.charset, TD_LOCALE_LEN);
   taosRUnLockLatch(&pMgmt->latch);
 
   req.pVloads = taosArrayInit(TSDB_MAX_VNODES, sizeof(SVnodeLoad));

source/dnode/mgmt/impl/test/sut/src/sut.cpp

@@ -33,7 +33,7 @@ void Testbase::InitLog(const char* path) {
 
   taosRemoveDir(path);
   taosMkDir(path);
-  tstrncpy(tsLogDir, path, PATH_MAX);
+  osSetLogDir(path);
   if (taosInitLog("taosdlog", 1) != 0) {
     printf("failed to init log file\n");
   }

source/libs/catalog/test/catalogTests.cpp

@@ -132,7 +132,7 @@ void ctgTestInitLogFile() {
   ctgDbgEnableDebug("api");
   
   if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
-    printf("failed to open log file in directory:%s\n", tsLogDir);
+    printf("failed to open log file in directory:%s\n", osLogDir());
   }
 }
 

source/libs/config/src/config.c

@@ -16,9 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "cfgInt.h"
 #include "tep.h"
-#include "tlocale.h"
 #include "tmsg.h"
-#include "ttimezone.h"
 
 #define CFG_NAME_PRINT_LEN 22
 #define CFG_SRC_PRINT_LEN 12
@@ -593,16 +591,16 @@ void cfgDumpCfg(SConfig *pCfg) {
 
 //   pItem = cfgGetItem(pCfg, "dataDir");
 //   if (pItem != NULL) {
-//     tstrncpy(tsDataDir, pItem->str, PATH_MAX);
+//     tstrncpy(osDataDir(), pItem->str, PATH_MAX);
 //   }
 
 //   if (tsDiskCfgNum <= 0) {
-//     taosAddDataDir(0, tsDataDir, 0, 1);
+//     taosAddDataDir(0, osDataDir(), 0, 1);
 //     tsDiskCfgNum = 1;
-//     uTrace("dataDir:%s, level:0 primary:1 is configured by default", tsDataDir);
+//     uTrace("dataDir:%s, level:0 primary:1 is configured by default", osDataDir());
 //   }
 
-//   if (taosDirExist(tsTempDir) != 0) {
+//   if (taosDirExist(osTempDir()) != 0) {
 //     return -1;
 //   }
 

source/libs/executor/src/executorimpl.c

@@ -4629,7 +4629,7 @@ int32_t doInitQInfo(SQInfo* pQInfo, STSBuf* pTsBuf, void* tsdb, void* sourceOptr
   getIntermediateBufInfo(pRuntimeEnv, &ps, &pQueryAttr->intermediateResultRowSize);
 
   int32_t TENMB = 1024*1024*10;
-  int32_t code = createDiskbasedBuffer(&pRuntimeEnv->pResultBuf, ps, TENMB, pQInfo->qId, tsTempDir);
+  int32_t code = createDiskbasedBuffer(&pRuntimeEnv->pResultBuf, ps, TENMB, pQInfo->qId, osTempDir());
   if (code != TSDB_CODE_SUCCESS) {
     return code;
   }

source/libs/function/src/tpercentile.c

@@ -254,7 +254,7 @@ tMemBucket *tMemBucketCreate(int16_t nElemSize, int16_t dataType, double minval,
 
   resetSlotInfo(pBucket);
 
-  int32_t ret = createDiskbasedBuffer(&pBucket->pBuffer, pBucket->bufPageSize, pBucket->bufPageSize * 512, 1, tsTempDir);
+  int32_t ret = createDiskbasedBuffer(&pBucket->pBuffer, pBucket->bufPageSize, pBucket->bufPageSize * 512, 1, osTempDir());
   if (ret != 0) {
     tMemBucketDestroy(pBucket);
     return NULL;

source/libs/function/src/tudf.c

@@ -55,7 +55,7 @@ int32_t initUdfInfo(SUdfInfo* pUdfInfo) {
 
   } else {
     char path[PATH_MAX] = {0};
-    taosGetTmpfilePath("script", path, tsTempDir);
+    taosGetTmpfilePath("script", path, osTempDir());
 
     FILE* file = fopen(path, "w+");
 

source/libs/index/test/fstUT.cc

@@ -30,7 +30,7 @@ static void EnvInit() {
   taosRemoveDir(path.c_str());
   taosMkDir(path.c_str());
   // init log file
-  tstrncpy(tsLogDir, path.c_str(), PATH_MAX);
+  osSetLogDir( path.c_str());
   if (taosInitLog("tindex.idx", 1) != 0) {
     printf("failed to init log");
   }

source/libs/parser/src/insertParser.c

@@ -204,7 +204,7 @@ static int parseTime(char **end, SToken *pToken, int16_t timePrec, int64_t *time
     bool isSigned = false;
     toInteger(pToken->z, pToken->n, 10, &ts, &isSigned);
   } else { // parse the RFC-3339/ISO-8601 timestamp format string
-    if (taosParseTime(pToken->z, time, pToken->n, timePrec, tsDaylight) != TSDB_CODE_SUCCESS) {
+    if (taosParseTime(pToken->z, time, pToken->n, timePrec, osDaylight()) != TSDB_CODE_SUCCESS) {
       return buildSyntaxErrMsg(pMsgBuf, "invalid timestamp format", pToken->z);
     }
 

source/libs/parser/src/parserImpl.c

@@ -578,7 +578,7 @@ static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) {
           return DEAL_RES_ERROR;
         }
         int32_t len = trimStringCopy(pVal->literal, n, tmp);
-        if (taosParseTime(tmp, &pVal->datum.i, len, pVal->node.resType.precision, tsDaylight) != TSDB_CODE_SUCCESS) {
+        if (taosParseTime(tmp, &pVal->datum.i, len, pVal->node.resType.precision, osDaylight()) != TSDB_CODE_SUCCESS) {
           tfree(tmp);
           generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, pVal->literal);
           return DEAL_RES_ERROR;

source/libs/parser/src/parserUtil.c

@@ -1639,7 +1639,7 @@ static int parseTime(char **end, SToken *pToken, int16_t timePrec, int64_t *time
     bool isSigned = false;
     toInteger(pToken->z, pToken->n, 10, &ts, &isSigned);
   } else { // parse the RFC-3339/ISO-8601 timestamp format string
-    if (taosParseTime(pToken->z, time, pToken->n, timePrec, tsDaylight) != TSDB_CODE_SUCCESS) {
+    if (taosParseTime(pToken->z, time, pToken->n, timePrec, osDaylight()) != TSDB_CODE_SUCCESS) {
       return buildSyntaxErrMsg(pMsgBuf, "invalid timestamp format", pToken->z);
     }
 

source/libs/qworker/test/qworkerTests.cpp

@@ -102,7 +102,7 @@ void qwtInitLogFile() {
   qDebugFlag = 159;
 
   if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
-    printf("failed to open log file in directory:%s\n", tsLogDir);
+    printf("failed to open log file in directory:%s\n", osLogDir());
   }
 
 }

source/libs/scalar/test/filter/filterTests.cpp

@@ -53,7 +53,7 @@ void flttInitLogFile() {
   qDebugFlag = 159;
 
   if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
-    printf("failed to open log file in directory:%s\n", tsLogDir);
+    printf("failed to open log file in directory:%s\n", osLogDir());
   }
 }
 

source/libs/scalar/test/scalar/scalarTests.cpp

@@ -52,7 +52,7 @@ void scltInitLogFile() {
   qDebugFlag = 159;
 
   if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
-    printf("failed to open log file in directory:%s\n", tsLogDir);
+    printf("failed to open log file in directory:%s\n", osLogDir());
   }
 }
 

source/libs/scheduler/test/schedulerTests.cpp

@@ -67,7 +67,7 @@ void schtInitLogFile() {
   qDebugFlag = 159;
 
   if (taosInitLog(defaultLogFileNamePrefix, maxLogFileNum) < 0) {
-    printf("failed to open log file in directory:%s\n", tsLogDir);
+    printf("failed to open log file in directory:%s\n", osLogDir());
   }
 
 }

source/libs/transport/test/transUT.cc

@@ -155,7 +155,7 @@ class TransObj {
     taosRemoveDir(path.c_str());
     taosMkDir(path.c_str());
 
-    tstrncpy(tsLogDir, path.c_str(), PATH_MAX);
+    osSetLogDir(path.c_str());
     if (taosInitLog("taosdlog", 1) != 0) {
       printf("failed to init log file\n");
     }

source/os/src/osDir.c

@@ -71,7 +71,7 @@ int32_t taosMkDir(const char *dirname) {
   return code;
 }
 
-void taosRemoveOldFiles(char *dirname, int32_t keepDays) {
+void taosRemoveOldFiles(const char *dirname, int32_t keepDays) {
   DIR *dir = opendir(dirname);
   if (dir == NULL) return;
 

source/os/src/osEnv.c

@@ -13,77 +13,100 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #define _DEFAULT_SOURCE
-#include "os.h"
 #include "osEnv.h"
-#include "osSysinfo.h"
-
-SDiskSpace tsLogSpace;
-SDiskSpace tsTempSpace;
-SDiskSpace tsDataSpace;
-
-void taosUpdateLogSpace() { taosGetDiskSize(tsLogDir, &tsLogSpace.size); }
-
-void taosUpdateTempSpace() { taosGetDiskSize(tsTempDir, &tsTempSpace.size); }
-
-void taosUpdateDataSpace() { taosGetDiskSize(tsDataDir, &tsDataSpace.size); }
-
-bool taosLogSpaceAvailable() { return tsLogSpace.reserved < tsLogSpace.size.avail; }
-
-bool taosTempSpaceAvailable() { return tsTempSpace.reserved < tsTempSpace.size.avail; }
 
-bool taosDataSpaceAvailable() { return tsDataSpace.reserved < tsDataSpace.size.avail; }
-
-void taosUpdateAllSpace() {
-  taosUpdateLogSpace();
-  taosUpdateTempSpace();
-  taosUpdateDataSpace();
+extern void taosWinSocketInit();
+char configDir[PATH_MAX] = {0};
+
+typedef struct SOsEnv {
+  char       dataDir[PATH_MAX];
+  char       logDir[PATH_MAX];
+  char       tempDir[PATH_MAX];
+  SDiskSpace dataSpace;
+  SDiskSpace logSpace;
+  SDiskSpace tempSpace;
+  char       osName[16];
+  char       timezone[TD_TIMEZONE_LEN];
+  char       locale[TD_LOCALE_LEN];
+  char       charset[TD_CHARSET_LEN];
+  int8_t     daylight;
+} SOsEnv;
+
+static SOsEnv env = {0};
+
+SOsEnv *osEnv() { return &env; }
+
+void osInitImp() {
+  taosGetSystemLocale(env.locale, env.charset);
+  taosGetSystemTimezone(env.timezone);
+  osSetTimezone(env.timezone);
 }
 
-#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
-
-char tsOsName[10] = "Windows";
-char configDir[PATH_MAX] = "C:/TDengine/cfg";
-char tsDataDir[PATH_MAX] = "C:/TDengine/data";
-char tsLogDir[PATH_MAX] = "C:/TDengine/log";
-char tsTempDir[PATH_MAX] = "C:\\Windows\\Temp";
+void osUpdate() {
+  if (env.logDir[0] != 0) {
+    taosGetDiskSize(env.logDir, &env.logSpace.size);
+  }
+  if (env.dataDir[0] != 0) {
+    taosGetDiskSize(env.dataDir, &env.dataSpace.size);
+  }
+  if (env.tempDir[0] != 0) {
+    taosGetDiskSize(env.tempDir, &env.tempSpace.size);
+  }
+}
 
-extern taosWinSocketInit();
+bool   osLogSpaceAvailable() { return env.logSpace.reserved <= env.logSpace.size.avail; }
+int8_t osDaylight() { return env.daylight; }
+
+const char *osLogDir() { return env.logDir; }
+const char *osTempDir() { return env.tempDir; }
+const char *osDataDir() { return env.dataDir; }
+const char *osName() { return env.osName; }
+const char *osTimezone() { return env.timezone; }
+const char *osLocale() { return env.locale; }
+const char *osCharset() { return env.charset; }
+
+void osSetLogDir(const char *logDir) { tstrncpy(env.logDir, logDir, PATH_MAX); }
+void osSetTempDir(const char *tempDir) { tstrncpy(env.tempDir, tempDir, PATH_MAX); }
+void osSetDataDir(const char *dataDir) { tstrncpy(env.dataDir, dataDir, PATH_MAX); }
+void osSetLogReservedSpace(float sizeInGB) { env.logSpace.reserved = sizeInGB; }
+void osSetTempReservedSpace(float sizeInGB) { env.tempSpace.reserved = sizeInGB; }
+void osSetDataReservedSpace(float sizeInGB) { env.dataSpace.reserved = sizeInGB; }
+void osSetTimezone(const char *timezone) { taosSetSystemTimezone(timezone, env.timezone, &env.daylight); }
 
 void osInit() {
+  srand(taosSafeRand());
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   taosWinSocketInit();
 
   const char *tmpDir = getenv("tmp");
   if (tmpDir == NULL) {
     tmpDir = getenv("temp");
   }
-
   if (tmpDir != NULL) {
-    strcpy(tsTempDir, tmpDir);
+    strcpy(env.tempDir, tmpDir);
   }
-}
-
-#elif defined(_TD_DARWIN_64)
 
-char tsOsName[10] = "Darwin";
-char configDir[PATH_MAX] = "/usr/local/etc/taos";
-char tsDataDir[PATH_MAX] = "/usr/local/var/lib/taos";
-char tsLogDir[PATH_MAX] = "/usr/local/var/log/taos";
-char tsTempDir[PATH_MAX] = "/tmp/taosd";
+  strcpy(configDir, "C:\\TDengine\\cfg");
+  strcpy(env.dataDir, "C:\\TDengine\\data");
+  strcpy(env.logDir, "C:\\TDengine\\log");
+  strcpy(env.tempDir, "C:\\Windows\\Temp");
+  strcpy(env.osName, "Windows");
 
-void osInit() {}
+#elif defined(_TD_DARWIN_64)
+  strcpy(configDir, "/tmp/taosd");
+  strcpy(env.dataDir, "/usr/local/var/lib/taos");
+  strcpy(env.logDir, "/usr/local/var/log/taos");
+  strcpy(env.tempDir, "/usr/local/etc/taos");
+  strcpy(env.osName, "Darwin");
 
 #else
-
-char tsOsName[10] = "Linux";
-char configDir[PATH_MAX] = "/etc/taos";
-char tsDataDir[PATH_MAX] = "/var/lib/taos";
-char tsLogDir[PATH_MAX] = "/var/log/taos";
-char tsTempDir[PATH_MAX] = "/tmp/";
-
-void osInit() {
-    srand(taosSafeRand());
-}
+  strcpy(configDir, "/etc/taos");
+  strcpy(env.dataDir, "/var/lib/taos");
+  strcpy(env.logDir, "/var/log/taos");
+  strcpy(env.tempDir, "/tmp");
+  strcpy(env.osName, "Linux");
 
 #endif
+}
\ No newline at end of file

source/os/src/osLocale.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "osLocale.h"
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+#if (_WIN64)
+#include <iphlpapi.h>
+#include <mswsock.h>
+#include <psapi.h>
+#include <stdio.h>
+#include <windows.h>
+#include <ws2tcpip.h>
+#pragma comment(lib, "Mswsock.lib ")
+#endif
+#include <objbase.h>
+#pragma warning(push)
+#pragma warning(disable : 4091)
+#include <DbgHelp.h>
+#pragma warning(pop)
+#elif defined(_TD_DARWIN_64)
+#include <errno.h>
+#include <libproc.h>
+#else
+#include <argp.h>
+#include <linux/sysctl.h>
+#include <sys/file.h>
+#include <sys/resource.h>
+#include <sys/statvfs.h>
+#include <sys/syscall.h>
+#include <sys/utsname.h>
+#include <unistd.h>
+#endif
+
+typedef struct CharsetPair {
+  char *oldCharset;
+  char *newCharset;
+} CharsetPair;
+
+char *taosCharsetReplace(char *charsetstr) {
+  CharsetPair charsetRep[] = {
+      {"utf8", "UTF-8"},
+      {"936", "CP936"},
+  };
+
+  for (int32_t i = 0; i < tListLen(charsetRep); ++i) {
+    if (strcasecmp(charsetRep[i].oldCharset, charsetstr) == 0) {
+      return strdup(charsetRep[i].newCharset);
+    }
+  }
+
+  return strdup(charsetstr);
+}
+
+/**
+ * In some Linux systems, setLocale(LC_CTYPE, "") may return NULL, in which case the launch of
+ * both the TDengine Server and the Client may be interrupted.
+ *
+ * In case that the setLocale failed to be executed, the right charset needs to be set.
+ */
+void taosSetSystemLocale(const char *inLocale, const char *inCharSet) {
+  char *locale = setlocale(LC_CTYPE, inLocale);
+
+  // default locale or user specified locale is not valid, abort launch
+  if (inLocale == NULL) {
+    printf("Invalid locale:%s, please set the valid locale in config file\n", inLocale);
+  }
+
+  if (strlen(inCharSet) == 0) {
+    printf("failed to get charset, please set the valid charset in config file\n");
+    exit(-1);
+  }
+
+  if (!taosValidateEncodec(inCharSet)) {
+    printf("Invalid charset:%s, please set the valid charset in config file", inCharSet);
+    exit(-1);
+  }
+}
+
+void taosGetSystemLocale(char *outLocale, char *outCharset) {
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  char *locale = setlocale(LC_CTYPE, "chs");
+  if (locale != NULL) {
+    tstrncpy(outLocale, locale, TD_LOCALE_LEN);
+  }
+  strcpy(outCharset, "cp936");
+
+#elif defined(_TD_DARWIN_64)
+  /*
+   * originally from src/os/src/detail/osSysinfo.c
+   * POSIX format locale string:
+   * (Language Strings)_(Country/Region Strings).(code_page)
+   *
+   * example: en_US.UTF-8, zh_CN.GB18030, zh_CN.UTF-8,
+   *
+   * if user does not specify the locale in taos.cfg the program use default LC_CTYPE as system locale.
+   *
+   * In case of some CentOS systems, their default locale is "en_US.utf8", which is not valid code_page
+   * for libiconv that is employed to convert string in this system. This program will automatically use
+   * UTF-8 instead as the charset.
+   *
+   * In case of windows client, the locale string is not valid POSIX format, user needs to set the
+   * correct code_page for libiconv. Usually, the code_page of windows system with simple chinese is
+   * CP936, CP437 for English charset.
+   *
+   */
+
+  char  sep = '.';
+  char *locale = NULL;
+
+  locale = setlocale(LC_CTYPE, "");
+  if (locale == NULL) {
+    // printf("can't get locale from system, set it to en_US.UTF-8 since error:%d:%s", errno, strerror(errno));
+    strcpy(outLocale, "en_US.UTF-8");
+  } else {
+    tstrncpy(outLocale, locale, TD_LOCALE_LEN);
+    // printf("locale not configured, set to system default:%s", outLocale);
+  }
+
+  /* if user does not specify the charset, extract it from locale */
+  char *str = strrchr(outLocale, sep);
+  if (str != NULL) {
+    str++;
+
+    char *revisedCharset = taosCharsetReplace(str);
+    tstrncpy(outCharset, revisedCharset, TD_CHARSET_LEN);
+
+    free(revisedCharset);
+    // printf("charset not configured, set to system default:%s", outCharset);
+  } else {
+    strcpy(outCharset, "UTF-8");
+    // printf("can't get locale and charset from system, set it to UTF-8");
+  }
+
+#else
+  /*
+   * POSIX format locale string:
+   * (Language Strings)_(Country/Region Strings).(code_page)
+   *
+   * example: en_US.UTF-8, zh_CN.GB18030, zh_CN.UTF-8,
+   *
+   * if user does not specify the locale in taos.cfg the program use default LC_CTYPE as system locale.
+   *
+   * In case of some CentOS systems, their default locale is "en_US.utf8", which is not valid code_page
+   * for libiconv that is employed to convert string in this system. This program will automatically use
+   * UTF-8 instead as the charset.
+   *
+   * In case of windows client, the locale string is not valid POSIX format, user needs to set the
+   * correct code_page for libiconv. Usually, the code_page of windows system with simple chinese is
+   * CP936, CP437 for English charset.
+   *
+   */
+  char  sep = '.';
+  char *locale = NULL;
+
+  locale = setlocale(LC_CTYPE, "");
+  if (locale == NULL) {
+    // printf("can't get locale from system, set it to en_US.UTF-8 since error:%d:%s", errno, strerror(errno));
+    strcpy(outLocale, "en_US.UTF-8");
+  } else {
+    tstrncpy(outLocale, locale, TD_LOCALE_LEN);
+    // printf("locale not configured, set to system default:%s", outLocale);
+  }
+
+  // if user does not specify the charset, extract it from locale
+  char *str = strrchr(outLocale, sep);
+  if (str != NULL) {
+    str++;
+
+    char *revisedCharset = taosCharsetReplace(str);
+    tstrncpy(outCharset, revisedCharset, TD_LOCALE_LEN);
+
+    free(revisedCharset);
+    // printf("charset not configured, set to system default:%s", outCharset);
+  } else {
+    strcpy(outCharset, "UTF-8");
+    // printf("can't get locale and charset from system, set it to UTF-8");
+  }
+
+#endif
+}

source/os/src/osString.c

@@ -18,24 +18,6 @@
 #include <wchar.h>
 #include <wctype.h>
 
-typedef struct CharsetPair {
-  char *oldCharset;
-  char *newCharset;
-} CharsetPair;
-
-char *taosCharsetReplace(char *charsetstr) {
-  CharsetPair charsetRep[] = {
-      { "utf8", "UTF-8" }, { "936", "CP936" },
-  };
-
-  for (int32_t i = 0; i < tListLen(charsetRep); ++i) {
-    if (strcasecmp(charsetRep[i].oldCharset, charsetstr) == 0) {
-      return strdup(charsetRep[i].newCharset);
-    }
-  }
-
-  return strdup(charsetstr);
-}
 
 int64_t taosStr2int64(const char *str) {
   char *endptr = NULL;

source/os/src/osSysinfo.c

@@ -21,10 +21,6 @@ int64_t tsPageSize = 0;
 int64_t tsOpenMax = 0;
 int64_t tsStreamMax = 0;
 int32_t tsNumOfCores = 1;
-char    tsTimezone[TSDB_TIMEZONE_LEN] = {0};
-char    tsLocale[TSDB_LOCALE_LEN] = {0};
-char    tsCharset[TSDB_LOCALE_LEN] = {0};  // default encode string
-
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
 
 /*
@@ -89,25 +85,6 @@ bool taosGetProcMemory(float *memoryUsedMB) {
   return true;
 }
 
-static void taosGetSystemTimezone() {
-  // get and set default timezone
-  char *tz = getenv("TZ");
-  if (tz == NULL || strlen(tz) == 0) {
-    strcpy(tsTimezone, "not configured");
-  } else {
-    strcpy(tsTimezone, tz);
-  }
-}
-
-static void taosGetSystemLocale() {
-  // get and set default locale
-  char *locale = setlocale(LC_CTYPE, "chs");
-  if (locale != NULL) {
-    tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
-  }
-
-  strcpy(tsCharset, "cp936");
-}
 
 int32_t taosGetCpuCores() {
   SYSTEM_INFO info;
@@ -134,7 +111,7 @@ int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize) {
     diskSize->used = (int64_t)(i64TotalBytes - i64FreeBytes);
     return 0;
   } else {
-    //printf("failed to get disk size, dataDir:%s errno:%s", tsDataDir, strerror(errno));
+    //printf("failed to get disk size, dataDir:%s errno:%s", osDataDir(), strerror(errno));
     terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
   }
@@ -200,8 +177,6 @@ void taosGetSystemInfo() {
   taosGetCpuUsage(&tmp1, &tmp2);
   taosGetProcIO(&tmp1, &tmp2);
 
-  taosGetSystemTimezone();
-  taosGetSystemLocale();
 }
 
 void taosKillSystem() {
@@ -273,103 +248,6 @@ char *taosGetCmdlineByPID(int pid) { return ""; }
 #include <errno.h>
 #include <libproc.h>
 
-static void taosGetSystemTimezone() {
-  /* load time zone string from /etc/localtime */
-  char  buf[4096];
-  char *tz = NULL;
-  {
-    int n = readlink("/etc/localtime", buf, sizeof(buf));
-    if (n < 0) {
-      //printf("read /etc/localtime error, reason:%s", strerror(errno));
-      return;
-    }
-    buf[n] = '\0';
-    for (int i = n - 1; i >= 0; --i) {
-      if (buf[i] == '/') {
-        if (tz) {
-          tz = buf + i + 1;
-          break;
-        }
-        tz = buf + i + 1;
-      }
-    }
-    if (!tz || 0 == strchr(tz, '/')) {
-      //printf("parsing /etc/localtime failed");
-      return;
-    }
-
-    setenv("TZ", tz, 1);
-    tzset();
-  }
-
-  /*
-   * NOTE: do not remove it.
-   * Enforce set the correct daylight saving time(DST) flag according
-   * to current time
-   */
-  time_t    tx1 = time(NULL);
-  struct tm tm1;
-  localtime_r(&tx1, &tm1);
-
-  /*
-   * format example:
-   *
-   * Asia/Shanghai   (CST, +0800)
-   * Europe/London   (BST, +0100)
-   */
-  snprintf(tsTimezone, TSDB_TIMEZONE_LEN, "%s (%s, %+03ld00)", tz, tm1.tm_isdst ? tzname[daylight] : tzname[0],
-           -timezone / 3600);
-
-  // cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
-  //printf("timezone not configured, set to system default:%s", tsTimezone);
-}
-
-/*
- * originally from src/os/src/detail/osSysinfo.c
- * POSIX format locale string:
- * (Language Strings)_(Country/Region Strings).(code_page)
- *
- * example: en_US.UTF-8, zh_CN.GB18030, zh_CN.UTF-8,
- *
- * if user does not specify the locale in taos.cfg the program use default LC_CTYPE as system locale.
- *
- * In case of some CentOS systems, their default locale is "en_US.utf8", which is not valid code_page
- * for libiconv that is employed to convert string in this system. This program will automatically use
- * UTF-8 instead as the charset.
- *
- * In case of windows client, the locale string is not valid POSIX format, user needs to set the
- * correct code_page for libiconv. Usually, the code_page of windows system with simple chinese is
- * CP936, CP437 for English charset.
- *
- */
-static void taosGetSystemLocale() {  // get and set default locale
-  char  sep = '.';
-  char *locale = NULL;
-
-  locale = setlocale(LC_CTYPE, "");
-  if (locale == NULL) {
-    //printf("can't get locale from system, set it to en_US.UTF-8 since error:%d:%s", errno, strerror(errno));
-    strcpy(tsLocale, "en_US.UTF-8");
-  } else {
-    tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
-    //printf("locale not configured, set to system default:%s", tsLocale);
-  }
-
-  /* if user does not specify the charset, extract it from locale */
-  char *str = strrchr(tsLocale, sep);
-  if (str != NULL) {
-    str++;
-
-    char *revisedCharset = taosCharsetReplace(str);
-    tstrncpy(tsCharset, revisedCharset, TSDB_LOCALE_LEN);
-
-    free(revisedCharset);
-    //printf("charset not configured, set to system default:%s", tsCharset);
-  } else {
-    strcpy(tsCharset, "UTF-8");
-    //printf("can't get locale and charset from system, set it to UTF-8");
-  }
-}
 
 void taosKillSystem() {
   //printf("function taosKillSystem, exit!");
@@ -386,9 +264,6 @@ void taosGetSystemInfo() {
   long page_size = sysconf(_SC_PAGESIZE);
   tsTotalMemoryMB = physical_pages * page_size / (1024 * 1024);
   tsPageSize = page_size;
-
-  taosGetSystemTimezone();
-  taosGetSystemLocale();
 }
 
 bool taosReadProcIO(int64_t *rchars, int64_t *wchars) {
@@ -441,7 +316,7 @@ void taosSetCoreDump() {}
 int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize) {
   struct statvfs info;
   if (statvfs(dataDir, &info)) {
-    //printf("failed to get disk size, dataDir:%s errno:%s", tsDataDir, strerror(errno));
+    //printf("failed to get disk size, dataDir:%s errno:%s", osDataDir(), strerror(errno));
     terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
   } else {
@@ -625,110 +500,6 @@ static bool taosGetProcCpuInfo(ProcCpuInfo *cpuInfo) {
   return true;
 }
 
-static void taosGetSystemTimezone() {
-  /*
-   * NOTE: do not remove it.
-   * Enforce set the correct daylight saving time(DST) flag according
-   * to current time
-   */
-  time_t    tx1 = time(NULL);
-  struct tm tm1;
-  localtime_r(&tx1, &tm1);
-
-  /* load time zone string from /etc/timezone */
-  FILE *f = fopen("/etc/timezone", "r");
-  char  buf[68] = {0};
-  if (f != NULL) {
-    int len = fread(buf, 64, 1, f);
-    if (len < 64 && ferror(f)) {
-      fclose(f);
-      //printf("read /etc/timezone error, reason:%s", strerror(errno));
-      return;
-    }
-
-    fclose(f);
-
-    buf[sizeof(buf) - 1] = 0;
-    char *lineEnd = strstr(buf, "\n");
-    if (lineEnd != NULL) {
-      *lineEnd = 0;
-    }
-
-    // for CentOS system, /etc/timezone does not exist. Ignore the TZ environment variables
-    if (strlen(buf) > 0) {
-      setenv("TZ", buf, 1);
-    }
-  }
-  // get and set default timezone
-  tzset();
-
-  /*
-   * get CURRENT time zone.
-   * system current time zone is affected by daylight saving time(DST)
-   *
-   * e.g., the local time zone of London in DST is GMT+01:00,
-   * otherwise is GMT+00:00
-   */
-  int32_t tz = (-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR;
-  tz += daylight;
-
-  /*
-   * format example:
-   *
-   * Asia/Shanghai   (CST, +0800)
-   * Europe/London   (BST, +0100)
-   */
-  snprintf(tsTimezone, TSDB_TIMEZONE_LEN, "%s (%s, %s%02d00)", buf, tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
-
-  // cfg_timezone->cfgStatus = TAOS_CFG_CSTATUS_DEFAULT;
-  //printf("timezone not configured, set to system default:%s", tsTimezone);
-}
-
-/*
- * POSIX format locale string:
- * (Language Strings)_(Country/Region Strings).(code_page)
- *
- * example: en_US.UTF-8, zh_CN.GB18030, zh_CN.UTF-8,
- *
- * if user does not specify the locale in taos.cfg the program use default LC_CTYPE as system locale.
- *
- * In case of some CentOS systems, their default locale is "en_US.utf8", which is not valid code_page
- * for libiconv that is employed to convert string in this system. This program will automatically use
- * UTF-8 instead as the charset.
- *
- * In case of windows client, the locale string is not valid POSIX format, user needs to set the
- * correct code_page for libiconv. Usually, the code_page of windows system with simple chinese is
- * CP936, CP437 for English charset.
- *
- */
-static void taosGetSystemLocale() {  // get and set default locale
-  char  sep = '.';
-  char *locale = NULL;
-
-  locale = setlocale(LC_CTYPE, "");
-  if (locale == NULL) {
-    //printf("can't get locale from system, set it to en_US.UTF-8 since error:%d:%s", errno, strerror(errno));
-    strcpy(tsLocale, "en_US.UTF-8");
-  } else {
-    tstrncpy(tsLocale, locale, TSDB_LOCALE_LEN);
-    //printf("locale not configured, set to system default:%s", tsLocale);
-  }
-
-  // if user does not specify the charset, extract it from locale
-  char *str = strrchr(tsLocale, sep);
-  if (str != NULL) {
-    str++;
-
-    char *revisedCharset = taosCharsetReplace(str);
-    tstrncpy(tsCharset, revisedCharset, TSDB_LOCALE_LEN);
-
-    free(revisedCharset);
-    //printf("charset not configured, set to system default:%s", tsCharset);
-  } else {
-    strcpy(tsCharset, "UTF-8");
-    //printf("can't get locale and charset from system, set it to UTF-8");
-  }
-}
 
 int32_t taosGetCpuCores() { return (int32_t)sysconf(_SC_NPROCESSORS_ONLN); }
 
@@ -957,8 +728,6 @@ void taosGetSystemInfo() {
   taosGetCpuUsage(&tmp1, &tmp2);
   taosGetProcIO(&tmp1, &tmp2);
 
-  taosGetSystemTimezone();
-  taosGetSystemLocale();
 }
 
 void taosKillSystem() {

source/os/src/osTimeZone.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-// #include "ulog.h"
-// #include "tglobal.h"
-// #include "tutil.h"
-
-// TODO refactor to set the tz value through parameter
-void tsSetTimeZone() {
-#if 0 
-  SGlobalCfg *cfg_timezone = taosGetConfigOption("timezone");
-  if (cfg_timezone != NULL) {
-    uInfo("timezone is set to %s by %s", tsTimezone, tsCfgStatusStr[cfg_timezone->cfgStatus]);
-  }
-
-#ifdef WINDOWS
-  char winStr[TSDB_LOCALE_LEN * 2];
-  sprintf(winStr, "TZ=%s", tsTimezone);
-  putenv(winStr);
-#else
-  setenv("TZ", tsTimezone, 1);
-#endif
-  tzset();
-
-  /*
-  * get CURRENT time zone.
-  * system current time zone is affected by daylight saving time(DST)
-  *
-  * e.g., the local time zone of London in DST is GMT+01:00,
-  * otherwise is GMT+00:00
-  */
-#ifdef _MSC_VER
-#if _MSC_VER >= 1900
-  // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
-  int64_t timezone = _timezone;
-  int32_t daylight = _daylight;
-  char **tzname = _tzname;
-#endif
-#endif
-
-  int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR);
-  tz += daylight;
-
-  /*
-  * format:
-  * (CST, +0800)
-  * (BST, +0100)
-  */
-  sprintf(tsTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
-  tsDaylight = daylight;
-
-  uInfo("timezone format changed to %s", tsTimezone);
-
-#endif  
-}

source/os/src/osTimezone.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+#if (_WIN64)
+#include <iphlpapi.h>
+#include <mswsock.h>
+#include <psapi.h>
+#include <stdio.h>
+#include <windows.h>
+#include <ws2tcpip.h>
+#pragma comment(lib, "Mswsock.lib ")
+#endif
+#include <objbase.h>
+#pragma warning(push)
+#pragma warning(disable : 4091)
+#include <DbgHelp.h>
+#pragma warning(pop)
+#elif defined(_TD_DARWIN_64)
+#include <errno.h>
+#include <libproc.h>
+#else
+#include <argp.h>
+#include <linux/sysctl.h>
+#include <sys/file.h>
+#include <sys/resource.h>
+#include <sys/statvfs.h>
+#include <sys/syscall.h>
+#include <sys/utsname.h>
+#include <unistd.h>
+#endif
+
+void taosSetSystemTimezone(const char *inTimezone, char *outTimezone, int8_t *outDaylight) {
+#ifdef WINDOWS
+  char winStr[TD_LOCALE_LEN * 2];
+  sprintf(winStr, "TZ=%s", inTimezone);
+  putenv(winStr);
+#else
+  setenv("TZ", inTimezone, 1);
+#endif
+  tzset();
+
+  /*
+   * get CURRENT time zone.
+   * system current time zone is affected by daylight saving time(DST)
+   *
+   * e.g., the local time zone of London in DST is GMT+01:00,
+   * otherwise is GMT+00:00
+   */
+#ifdef _MSC_VER
+#if _MSC_VER >= 1900
+  // see https://docs.microsoft.com/en-us/cpp/c-runtime-library/daylight-dstbias-timezone-and-tzname?view=vs-2019
+  int64_t timezone = _timezone;
+  int32_t daylight = _daylight;
+  char  **tzname = _tzname;
+#endif
+#endif
+
+  int32_t tz = (int32_t)((-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR);
+  tz += daylight;
+
+  /*
+   * format:
+   * (CST, +0800)
+   * (BST, +0100)
+   */
+
+  sprintf(outTimezone, "(%s, %s%02d00)", tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
+  *outDaylight = daylight;
+}
+
+void taosGetSystemTimezone(char *outTimezone) {
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  char *tz = getenv("TZ");
+  if (tz == NULL || strlen(tz) == 0) {
+    strcpy(outTimezone, "not configured");
+  } else {
+    strcpy(outTimezone, tz);
+  }
+
+#elif defined(_TD_DARWIN_64)
+  char  buf[4096] = {0};
+  char *tz = NULL;
+  {
+    int n = readlink("/etc/localtime", buf, sizeof(buf));
+    if (n < 0) {
+      printf("read /etc/localtime error, reason:%s", strerror(errno));
+      return;
+    }
+    buf[n] = '\0';
+    for (int i = n - 1; i >= 0; --i) {
+      if (buf[i] == '/') {
+        if (tz) {
+          tz = buf + i + 1;
+          break;
+        }
+        tz = buf + i + 1;
+      }
+    }
+    if (!tz || 0 == strchr(tz, '/')) {
+      printf("parsing /etc/localtime failed");
+      return;
+    }
+
+    setenv("TZ", tz, 1);
+    tzset();
+  }
+
+  /*
+   * NOTE: do not remove it.
+   * Enforce set the correct daylight saving time(DST) flag according
+   * to current time
+   */
+  time_t    tx1 = time(NULL);
+  struct tm tm1;
+  localtime_r(&tx1, &tm1);
+
+  /*
+   * format example:
+   *
+   * Asia/Shanghai   (CST, +0800)
+   * Europe/London   (BST, +0100)
+   */
+  snprintf(outTimezone, TD_TIMEZONE_LEN, "%s (%s, %+03ld00)", tz, tm1.tm_isdst ? tzname[daylight] : tzname[0],
+           -timezone / 3600);
+
+#else
+  /*
+   * NOTE: do not remove it.
+   * Enforce set the correct daylight saving time(DST) flag according
+   * to current time
+   */
+  time_t    tx1 = time(NULL);
+  struct tm tm1;
+  localtime_r(&tx1, &tm1);
+
+  /* load time zone string from /etc/timezone */
+  FILE *f = fopen("/etc/timezone", "r");
+  char  buf[68] = {0};
+  if (f != NULL) {
+    int len = fread(buf, 64, 1, f);
+    if (len < 64 && ferror(f)) {
+      fclose(f);
+      // printf("read /etc/timezone error, reason:%s", strerror(errno));
+      return;
+    }
+
+    fclose(f);
+
+    buf[sizeof(buf) - 1] = 0;
+    char *lineEnd = strstr(buf, "\n");
+    if (lineEnd != NULL) {
+      *lineEnd = 0;
+    }
+
+    // for CentOS system, /etc/timezone does not exist. Ignore the TZ environment variables
+    if (strlen(buf) > 0) {
+      setenv("TZ", buf, 1);
+    }
+  }
+  // get and set default timezone
+  tzset();
+
+  /*
+   * get CURRENT time zone.
+   * system current time zone is affected by daylight saving time(DST)
+   *
+   * e.g., the local time zone of London in DST is GMT+01:00,
+   * otherwise is GMT+00:00
+   */
+  int32_t tz = (-timezone * MILLISECOND_PER_SECOND) / MILLISECOND_PER_HOUR;
+  tz += daylight;
+
+  /*
+   * format example:
+   *
+   * Asia/Shanghai   (CST, +0800)
+   * Europe/London   (BST, +0100)
+   */
+  snprintf(outTimezone, TD_TIMEZONE_LEN, "%s (%s, %s%02d00)", buf, tzname[daylight], tz >= 0 ? "+" : "-", abs(tz));
+
+#endif
+}

source/util/src/tlog.c

@@ -118,10 +118,10 @@ static int32_t taosStartLog() {
 
 int32_t taosInitLog(const char *logName, int maxFiles) {
   if (tsLogInited) return 0;
-  taosUpdateLogSpace();
+  osUpdate();
 
   char fullName[PATH_MAX] = {0};
-  snprintf(fullName, PATH_MAX, "%s" TD_DIRSEP "%s", tsLogDir, logName);
+  snprintf(fullName, PATH_MAX, "%s" TD_DIRSEP "%s", osLogDir(), logName);
 
   tsLogObj.logHandle = taosLogBuffNew(TSDB_DEFAULT_LOG_BUF_SIZE);
   if (tsLogObj.logHandle == NULL) return -1;
@@ -187,7 +187,7 @@ static void taosKeepOldLog(char *oldName) {
     }
   }
 
-  taosRemoveOldFiles(tsLogDir, TABS(tsLogKeepDays));
+  taosRemoveOldFiles(osLogDir(), TABS(tsLogKeepDays));
 }
 
 static void *taosThreadToOpenNewFile(void *param) {
@@ -380,7 +380,7 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
 }
 
 void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
-  if (!taosLogSpaceAvailable()) return;
+  if (!osLogSpaceAvailable()) return;
 
   va_list        argpointer;
   char           buffer[MAX_LOGLINE_BUFFER_SIZE] = {0};
@@ -434,7 +434,7 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
 }
 
 void taosDumpData(unsigned char *msg, int32_t len) {
-  if (!taosLogSpaceAvailable()) return;
+  if (!osLogSpaceAvailable()) return;
 
   char    temp[256];
   int32_t i, pos = 0, c = 0;
@@ -457,7 +457,7 @@ void taosDumpData(unsigned char *msg, int32_t len) {
 }
 
 void taosPrintLongString(const char *flags, int32_t dflag, const char *format, ...) {
-  if (!taosLogSpaceAvailable()) return;
+  if (!osLogSpaceAvailable()) return;
 
   va_list        argpointer;
   char           buffer[MAX_LOGLINE_DUMP_BUFFER_SIZE];

tools/shell/src/shellEngine.c

@@ -68,11 +68,11 @@ TAOS *shellInit(SShellArguments *_args) {
   printf("\n");
   if (!_args->is_use_passwd) {
 #ifdef TD_WINDOWS
-    strcpy(tsOsName, "Windows");
+    strcpy(osName(), "Windows");
 #elif defined(TD_DARWIN)
-    strcpy(tsOsName, "Darwin");
+    strcpy(osName(), "Darwin");
 #endif
-    printf(CLIENT_VERSION, tsOsName, taos_get_client_info());
+    printf(CLIENT_VERSION, osName(), taos_get_client_info());
   }
 
   fflush(stdout);

tools/shell/src/shellLinux.c

@@ -184,8 +184,7 @@ static void parse_args(
     for (int i = 1; i < argc; i++) {
         if ((strncmp(argv[i], "-p", 2) == 0)
               || (strncmp(argv[i], "--password", 10) == 0)) {
-            strcpy(tsOsName, "Linux");
-            printf(LINUXCLIENT_VERSION, tsOsName, taos_get_client_info());
+            printf(LINUXCLIENT_VERSION, osName(), taos_get_client_info());
             if ((strlen(argv[i]) == 2)
                   || (strncmp(argv[i], "--password", 10) == 0)) {
                 printf("Enter password: ");