提交 bf8c64d3 编写于 作者: T tickduan

change config name

上级 69c6748f
...@@ -210,8 +210,8 @@ extern int32_t debugFlag; ...@@ -210,8 +210,8 @@ extern int32_t debugFlag;
extern char lossyColumns[]; extern char lossyColumns[];
extern double fPrecision; extern double fPrecision;
extern double dPrecision; extern double dPrecision;
extern uint32_t maxIntervals; extern uint32_t maxRange;
extern uint32_t intervals; extern uint32_t range;
extern char Compressor[]; extern char Compressor[];
#endif #endif
......
...@@ -252,8 +252,8 @@ char lossyColumns[32] = ""; // "float|double" means all float and double column ...@@ -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 maxIntervals = 500; // max intervals uint32_t maxRange = 500; // max range
uint32_t intervals = 100; // intervals uint32_t range = 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,13 +312,7 @@ bool taosCfgDynamicOptions(char *msg) { ...@@ -312,13 +312,7 @@ 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;
if (strncasecmp(option, cfg->option, olen) != 0) continue; y
if (cfg->valType == TAOS_CFG_VTYPE_INT32) {
*((int32_t *)cfg->ptr) = vint;
} else {
*((int8_t *)cfg->ptr) = (int8_t)vint;
}
if (strncasecmp(cfg->option, "monitor", olen) == 0) { if (strncasecmp(cfg->option, "monitor", olen) == 0) {
if (1 == vint) { if (1 == vint) {
if (monStartSystemFp) { if (monStartSystemFp) {
...@@ -1533,7 +1527,7 @@ static void doInitGlobalConfig(void) { ...@@ -1533,7 +1527,7 @@ static void doInitGlobalConfig(void) {
#ifdef TD_TSZ #ifdef TD_TSZ
// lossy compress // lossy compress
cfg.option = "lossyColumns"; cfg.option = "lossyColumns";
cfg.ptr = lossyColumns; cfg.ptr = lossyColumns;
cfg.valType = TAOS_CFG_VTYPE_STRING; cfg.valType = TAOS_CFG_VTYPE_STRING;
cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
...@@ -1565,8 +1559,8 @@ static void doInitGlobalConfig(void) { ...@@ -1565,8 +1559,8 @@ static void doInitGlobalConfig(void) {
cfg.unitType = TAOS_CFG_UTYPE_NONE; cfg.unitType = TAOS_CFG_UTYPE_NONE;
taosInitConfigOption(cfg); taosInitConfigOption(cfg);
cfg.option = "maxIntervals"; cfg.option = "maxRange";
cfg.ptr = &maxIntervals; cfg.ptr = &maxRange;
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;
...@@ -1575,8 +1569,8 @@ static void doInitGlobalConfig(void) { ...@@ -1575,8 +1569,8 @@ static void doInitGlobalConfig(void) {
cfg.unitType = TAOS_CFG_UTYPE_NONE; cfg.unitType = TAOS_CFG_UTYPE_NONE;
taosInitConfigOption(cfg); taosInitConfigOption(cfg);
cfg.option = "intervals"; cfg.option = "range";
cfg.ptr = &intervals; cfg.ptr = ⦥
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;
......
...@@ -1146,6 +1146,7 @@ static int32_t mnodeRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, v ...@@ -1146,6 +1146,7 @@ static int32_t mnodeRetrieveConfigs(SShowObj *pShow, char *data, int32_t rows, v
numOfRows++; numOfRows++;
break; break;
case TAOS_CFG_VTYPE_FLOAT: case TAOS_CFG_VTYPE_FLOAT:
case TAOS_CFG_VTYPE_DOUBLE:
t = snprintf(varDataVal(pWrite), TSDB_CFG_VALUE_LEN, "%f", *((float *)cfg->ptr)); t = snprintf(varDataVal(pWrite), TSDB_CFG_VALUE_LEN, "%f", *((float *)cfg->ptr));
varDataSetLen(pWrite, t); varDataSetLen(pWrite, t);
numOfRows++; numOfRows++;
......
...@@ -85,7 +85,7 @@ int tsCompressInit(){ ...@@ -85,7 +85,7 @@ int tsCompressInit(){
if(lossyFloat == false && lossyDouble == false) if(lossyFloat == false && lossyDouble == false)
return 0; return 0;
tdszInit(fPrecision, dPrecision, maxIntervals, intervals, Compressor); tdszInit(fPrecision, dPrecision, maxRange, range, Compressor);
if(lossyFloat) if(lossyFloat)
uInfo("lossy compression float is opened. "); uInfo("lossy compression float is opened. ");
if(lossyDouble) if(lossyDouble)
......
...@@ -484,6 +484,9 @@ void taosPrintGlobalCfg() { ...@@ -484,6 +484,9 @@ void taosPrintGlobalCfg() {
case TAOS_CFG_VTYPE_FLOAT: case TAOS_CFG_VTYPE_FLOAT:
uInfo(" %s:%s%f%s", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]); uInfo(" %s:%s%f%s", cfg->option, blank, *((float *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
break; break;
case TAOS_CFG_VTYPE_DOUBLE:
uInfo(" %s:%s%f%s", cfg->option, blank, *((double *)cfg->ptr), tsGlobalUnit[cfg->unitType]);
break;
case TAOS_CFG_VTYPE_STRING: case TAOS_CFG_VTYPE_STRING:
case TAOS_CFG_VTYPE_IPSTR: case TAOS_CFG_VTYPE_IPSTR:
case TAOS_CFG_VTYPE_DIRECTORY: case TAOS_CFG_VTYPE_DIRECTORY:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册