From d2a6904c5e3397a87c7a1793b7e70a06508527be Mon Sep 17 00:00:00 2001 From: tickduan <417921451@qq.com> Date: Thu, 8 Jul 2021 21:36:26 +0800 Subject: [PATCH] mac build ok --- src/common/src/tglobal.c | 28 +++++++++++++++------------- src/util/inc/tconfig.h | 4 ++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 896f53d255..36aad26083 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -180,15 +180,15 @@ int8_t tsEnableStream = 1; int8_t tsCompactMnodeWal = 0; int8_t tsPrintAuth = 0; int8_t tscEmbedded = 0; -char configDir[PATH_MAX] = {0}; -char tsVnodeDir[PATH_MAX] = {0}; -char tsDnodeDir[PATH_MAX] = {0}; -char tsMnodeDir[PATH_MAX] = {0}; -char tsMnodeTmpDir[PATH_MAX] = {0}; -char tsMnodeBakDir[PATH_MAX] = {0}; -char tsDataDir[PATH_MAX] = {0}; -char tsScriptDir[PATH_MAX] = {0}; -char tsTempDir[PATH_MAX] = "/tmp/"; +char configDir[TSDB_FILENAME_LEN] = {0}; +char tsVnodeDir[TSDB_FILENAME_LEN] = {0}; +char tsDnodeDir[TSDB_FILENAME_LEN] = {0}; +char tsMnodeDir[TSDB_FILENAME_LEN] = {0}; +char tsMnodeTmpDir[TSDB_FILENAME_LEN] = {0}; +char tsMnodeBakDir[TSDB_FILENAME_LEN] = {0}; +char tsDataDir[TSDB_FILENAME_LEN] = {0}; +char tsScriptDir[TSDB_FILENAME_LEN] = {0}; +char tsTempDir[TSDB_FILENAME_LEN] = "/tmp/"; int32_t tsDiskCfgNum = 0; @@ -1555,18 +1555,20 @@ static void doInitGlobalConfig(void) { cfg.ptr = &fPrecision; cfg.valType = TAOS_CFG_VTYPE_DOUBLE; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; - cfg.minValue = -MAXFLOAT; - cfg.maxValue = MAXFLOAT; + cfg.minValue = MIN_FLOAT; + cfg.maxValue = MAX_FLOAT; cfg.ptrLength = 0; cfg.unitType = TAOS_CFG_UTYPE_NONE; + + taosInitConfigOption(cfg); cfg.option = "dPrecision"; cfg.ptr = &dPrecision; cfg.valType = TAOS_CFG_VTYPE_DOUBLE; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; - cfg.minValue = -MAXFLOAT; - cfg.maxValue = MAXFLOAT; + cfg.minValue = MIN_FLOAT; + cfg.maxValue = MAX_FLOAT; cfg.ptrLength = 0; cfg.unitType = TAOS_CFG_UTYPE_NONE; taosInitConfigOption(cfg); diff --git a/src/util/inc/tconfig.h b/src/util/inc/tconfig.h index 89f204dd77..d522bfc730 100644 --- a/src/util/inc/tconfig.h +++ b/src/util/inc/tconfig.h @@ -32,8 +32,8 @@ extern "C" { #define TSDB_CFG_CTYPE_B_OPTION 16U // can be configured by taos_options function #define TSDB_CFG_CTYPE_B_NOT_PRINT 32U // such as password -#define MAXFLOAT 100000 -#define MINFLOAT -100000 +#define MAX_FLOAT 100000 +#define MIN_FLOAT -100000 enum { TAOS_CFG_CSTATUS_NONE, // not configured -- GitLab