xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

global range conflict

This commit is contained in:
tickduan 2021-07-22 16:30:22 +08:00
parent bf8c64d3da
commit a9958dc5b8
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/inc/tglobal.h
View File

@ -211,7 +211,7 @@ extern char lossyColumns[];
extern double fPrecision; extern double fPrecision;
extern double dPrecision; extern double dPrecision;
extern uint32_t maxRange; extern uint32_t maxRange;
extern uint32_t range; extern uint32_t curRange;
extern char Compressor[]; extern char Compressor[];
#endif #endif

7
src/common/src/tglobal.c
View File

@ -252,8 +252,8 @@ char lossyColumns[32] = ""; // "float|double" means all float and double column
// below option can take effect when tsLossyColumns not empty // below option can take effect when tsLossyColumns not empty
double fPrecision = 1E-8; // float column precision double fPrecision = 1E-8; // float column precision
double dPrecision = 1E-16; // double column precision double dPrecision = 1E-16; // double column precision
uint32_t maxRange = 500; // max range uint32_t maxRange = 500; // max range
uint32_t range = 100; // range uint32_t curRange = 100; // range
char Compressor[32] = "ZSTD_COMPRESSOR"; // ZSTD_COMPRESSOR or GZIP_COMPRESSOR char Compressor[32] = "ZSTD_COMPRESSOR"; // ZSTD_COMPRESSOR or GZIP_COMPRESSOR
#endif #endif
@ -312,7 +312,6 @@ bool taosCfgDynamicOptions(char *msg) {
int32_t cfgLen = (int32_t)strlen(cfg->option); int32_t cfgLen = (int32_t)strlen(cfg->option);
if (cfgLen != olen) continue; if (cfgLen != olen) continue;
y
if (strncasecmp(cfg->option, "monitor", olen) == 0) { if (strncasecmp(cfg->option, "monitor", olen) == 0) {
if (1 == vint) { if (1 == vint) {
if (monStartSystemFp) { if (monStartSystemFp) {
@ -1570,7 +1569,7 @@ static void doInitGlobalConfig(void) {
taosInitConfigOption(cfg); taosInitConfigOption(cfg);
cfg.option = "range"; cfg.option = "range";
cfg.ptr = ⦥ cfg.ptr = &curRange;
cfg.valType = TAOS_CFG_VTYPE_INT32; cfg.valType = TAOS_CFG_VTYPE_INT32;
cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
cfg.minValue = 0; cfg.minValue = 0;

2
src/util/src/tcompression.c
View File

@ -85,7 +85,7 @@ int tsCompressInit(){
if(lossyFloat == false && lossyDouble == false) if(lossyFloat == false && lossyDouble == false)
return 0; return 0;
tdszInit(fPrecision, dPrecision, maxRange, range, Compressor); tdszInit(fPrecision, dPrecision, maxRange, curRange, Compressor);
if(lossyFloat) if(lossyFloat)
uInfo("lossy compression float is opened. "); uInfo("lossy compression float is opened. ");
if(lossyDouble) if(lossyDouble)