From a9958dc5b8d1454f02af1abcd350ec6b3e0666bb Mon Sep 17 00:00:00 2001 From: tickduan <417921451@qq.com> Date: Thu, 22 Jul 2021 16:30:22 +0800 Subject: [PATCH] global range conflict --- src/common/inc/tglobal.h | 2 +- src/common/src/tglobal.c | 7 +++---- src/util/src/tcompression.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index 19120bcad1..7290db6ec9 100644 --- a/src/common/inc/tglobal.h +++ b/src/common/inc/tglobal.h @@ -211,7 +211,7 @@ extern char lossyColumns[]; extern double fPrecision; extern double dPrecision; extern uint32_t maxRange; -extern uint32_t range; +extern uint32_t curRange; extern char Compressor[]; #endif diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 2acc5359a2..76179d3edc 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -252,8 +252,8 @@ char lossyColumns[32] = ""; // "float|double" means all float and double column // below option can take effect when tsLossyColumns not empty double fPrecision = 1E-8; // float column precision double dPrecision = 1E-16; // double column precision -uint32_t maxRange = 500; // max range -uint32_t range = 100; // range +uint32_t maxRange = 500; // max range +uint32_t curRange = 100; // range char Compressor[32] = "ZSTD_COMPRESSOR"; // ZSTD_COMPRESSOR or GZIP_COMPRESSOR #endif @@ -312,7 +312,6 @@ bool taosCfgDynamicOptions(char *msg) { int32_t cfgLen = (int32_t)strlen(cfg->option); if (cfgLen != olen) continue; -y if (strncasecmp(cfg->option, "monitor", olen) == 0) { if (1 == vint) { if (monStartSystemFp) { @@ -1570,7 +1569,7 @@ static void doInitGlobalConfig(void) { taosInitConfigOption(cfg); cfg.option = "range"; - cfg.ptr = ⦥ + cfg.ptr = &curRange; cfg.valType = TAOS_CFG_VTYPE_INT32; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; cfg.minValue = 0; diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c index e8a1f4c8ab..4472633304 100644 --- a/src/util/src/tcompression.c +++ b/src/util/src/tcompression.c @@ -85,7 +85,7 @@ int tsCompressInit(){ if(lossyFloat == false && lossyDouble == false) return 0; - tdszInit(fPrecision, dPrecision, maxRange, range, Compressor); + tdszInit(fPrecision, dPrecision, maxRange, curRange, Compressor); if(lossyFloat) uInfo("lossy compression float is opened. "); if(lossyDouble) -- GitLab