From 06c4aa431fa5cbfd86078d0e5479ffd07cdeabaa Mon Sep 17 00:00:00 2001 From: Shungang Li Date: Thu, 9 Nov 2023 17:22:35 +0800 Subject: [PATCH] enh: add humanStr convert func --- include/util/tunit.h | 35 +++++++ source/common/src/tglobal.c | 14 ++- source/dnode/mnode/impl/src/mndDnode.c | 3 +- source/util/src/tconfig.c | 9 +- source/util/src/tunit.c | 124 +++++++++++++++++++++++++ 5 files changed, 177 insertions(+), 8 deletions(-) create mode 100644 include/util/tunit.h create mode 100644 source/util/src/tunit.c diff --git a/include/util/tunit.h b/include/util/tunit.h new file mode 100644 index 0000000000..de37c85929 --- /dev/null +++ b/include/util/tunit.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * 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 . + */ + +#ifndef _TD_UNIT_H_ +#define _TD_UNIT_H_ + +#include "os.h" + +#ifdef __cplusplus +extern "C" { +#endif + +int64_t taosStrHumanToInt64(const char* str); +void taosInt64ToHumanStr(int64_t val, char* outStr); + +int32_t taosStrHumanToInt32(const char* str); +void taosInt32ToHumanStr(int32_t val, char* outStr); + +#ifdef __cplusplus +} +#endif + +#endif /*_TD_UNIT_H_*/ diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 4a1ba9e391..02af482e63 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -21,6 +21,7 @@ #include "tgrant.h" #include "tlog.h" #include "tmisce.h" +#include "tunit.h" #if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL) #include "cus_name.h" @@ -1645,7 +1646,7 @@ void taosCfgDynamicOptions(const char *option, const char *value) { return; } - { // 'bool/int32_t/int64_t' variables with general modification function + { // 'bool/int32_t/int64_t/float/double' variables with general modification function const int32_t nDebugFlag = 20; static OptionNameAndVar options[] = { {"dDebugFlag", &dDebugFlag}, @@ -1724,7 +1725,7 @@ void taosCfgDynamicOptions(const char *option, const char *value) { *pVar = flag; } break; case CFG_DTYPE_INT32: { - int32_t flag = atoi(value); + int32_t flag = taosStrHumanToInt32(value); int32_t *pVar = options[d].optionVar; uInfo("%s set from %d to %d", optName, *pVar, flag); *pVar = flag; @@ -1735,11 +1736,18 @@ void taosCfgDynamicOptions(const char *option, const char *value) { } } break; case CFG_DTYPE_INT64: { - int64_t flag = atoll(value); + int64_t flag = taosStrHumanToInt64(value); int64_t *pVar = options[d].optionVar; uInfo("%s set from %" PRId64 " to %" PRId64, optName, *pVar, flag); *pVar = flag; } break; + case CFG_DTYPE_FLOAT: + case CFG_DTYPE_DOUBLE: { + float flag = (float)atof(value); + float *pVar = options[d].optionVar; + uInfo("%s set from %f to %f", optName, *pVar, flag); + *pVar = flag; + } break; default: break; } diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index f4108b52c6..3f974a3136 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -27,6 +27,7 @@ #include "mndUser.h" #include "mndVgroup.h" #include "tmisce.h" +#include "tunit.h" #define TSDB_DNODE_VER_NUMBER 2 #define TSDB_DNODE_RESERVE_SIZE 64 @@ -1328,7 +1329,7 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) { snprintf(dcfgReq.value, TSDB_DNODE_VALUE_LEN, "%d", flag); #endif } else { - mndMCfg2DCfg(&cfgReq, &dcfgReq); + if (mndMCfg2DCfg(&cfgReq, &dcfgReq)) goto _err_out; if (strlen(dcfgReq.config) > TSDB_DNODE_CONFIG_LEN) { mError("dnode:%d, failed to config since config is too long", cfgReq.dnodeId); terrno = TSDB_CODE_INVALID_CFG; diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c index bb282b4ee3..a78d930326 100644 --- a/source/util/src/tconfig.c +++ b/source/util/src/tconfig.c @@ -22,6 +22,7 @@ #include "tjson.h" #include "tlog.h" #include "tutil.h" +#include "tunit.h" #define CFG_NAME_PRINT_LEN 24 #define CFG_SRC_PRINT_LEN 12 @@ -173,7 +174,7 @@ static int32_t cfgSetBool(SConfigItem *pItem, const char *value, ECfgSrcType sty } static int32_t cfgSetInt32(SConfigItem *pItem, const char *value, ECfgSrcType stype) { - int32_t ival = (int32_t)atoi(value); + int32_t ival = taosStrHumanToInt32(value); if (ival < pItem->imin || ival > pItem->imax) { uError("cfg:%s, type:%s src:%s value:%d out of range[%" PRId64 ", %" PRId64 "]", pItem->name, cfgDtypeStr(pItem->dtype), cfgStypeStr(stype), ival, pItem->imin, pItem->imax); @@ -187,7 +188,7 @@ static int32_t cfgSetInt32(SConfigItem *pItem, const char *value, ECfgSrcType st } static int32_t cfgSetInt64(SConfigItem *pItem, const char *value, ECfgSrcType stype) { - int64_t ival = (int64_t)atoll(value); + int64_t ival = taosStrHumanToInt64(value); if (ival < pItem->imin || ival > pItem->imax) { uError("cfg:%s, type:%s src:%s value:%" PRId64 " out of range[%" PRId64 ", %" PRId64 "]", pItem->name, cfgDtypeStr(pItem->dtype), cfgStypeStr(stype), ival, pItem->imin, pItem->imax); @@ -379,7 +380,7 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p } } break; case CFG_DTYPE_INT32: { - int32_t ival = (int32_t)atoi(pVal); + int32_t ival = (int32_t)taosStrHumanToInt32(pVal); if (ival < pItem->imin || ival > pItem->imax) { uError("cfg:%s, type:%s value:%d out of range[%" PRId64 ", %" PRId64 "]", pItem->name, cfgDtypeStr(pItem->dtype), ival, pItem->imin, pItem->imax); @@ -388,7 +389,7 @@ int32_t cfgCheckRangeForDynUpdate(SConfig *pCfg, const char *name, const char *p } } break; case CFG_DTYPE_INT64: { - int64_t ival = (int64_t)atoll(pVal); + int64_t ival = (int64_t)taosStrHumanToInt64(pVal); if (ival < pItem->imin || ival > pItem->imax) { uError("cfg:%s, type:%s value:%" PRId64 " out of range[%" PRId64 ", %" PRId64 "]", pItem->name, cfgDtypeStr(pItem->dtype), ival, pItem->imin, pItem->imax); diff --git a/source/util/src/tunit.c b/source/util/src/tunit.c new file mode 100644 index 0000000000..b0630ec8ca --- /dev/null +++ b/source/util/src/tunit.c @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * 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 . + */ + +#include "tunit.h" + +#define UNIT_SIZE_CONVERT_FACTOR 1024LL +#define UNIT_ONE_KIBIBYTE UNIT_SIZE_CONVERT_FACTOR +#define UNIT_ONE_MEBIBYTE (UNIT_ONE_KIBIBYTE * UNIT_SIZE_CONVERT_FACTOR) +#define UNIT_ONE_GIBIBYTE (UNIT_ONE_MEBIBYTE * UNIT_SIZE_CONVERT_FACTOR) +#define UNIT_ONE_TEBIBYTE (UNIT_ONE_GIBIBYTE * UNIT_SIZE_CONVERT_FACTOR) +#define UNIT_ONE_PEBIBYTE (UNIT_ONE_TEBIBYTE * UNIT_SIZE_CONVERT_FACTOR) +#define UNIT_ONE_EXBIBYTE (UNIT_ONE_PEBIBYTE * UNIT_SIZE_CONVERT_FACTOR) + +int64_t taosStrHumanToInt64(const char* str) { + size_t sLen = strlen(str); + if (sLen < 2) return atoll(str); + + int64_t val = 0; + + char* strNoUnit = NULL; + char unit = str[sLen - 1]; + if ((unit == 'P') || (unit == 'p')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_PEBIBYTE; + } else if ((unit == 'T') || (unit == 't')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_TEBIBYTE; + } else if ((unit == 'G') || (unit == 'g')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_GIBIBYTE; + } else if ((unit == 'M') || (unit == 'm')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_MEBIBYTE; + } else if ((unit == 'K') || (unit == 'k')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_KIBIBYTE; + } else { + val = atoll(str); + } + + taosMemoryFree(strNoUnit); + return val; +} + +void taosInt64ToHumanStr(int64_t val, char* outStr) { + if (((val >= UNIT_ONE_EXBIBYTE) || (-val >= UNIT_ONE_EXBIBYTE)) && ((val % UNIT_ONE_EXBIBYTE) == 0)) { + sprintf(outStr, "%qdE", (long long)val / UNIT_ONE_EXBIBYTE); + } else if (((val >= UNIT_ONE_PEBIBYTE) || (-val >= UNIT_ONE_PEBIBYTE)) && ((val % UNIT_ONE_PEBIBYTE) == 0)) { + sprintf(outStr, "%qdP", (long long)val / UNIT_ONE_PEBIBYTE); + } else if (((val >= UNIT_ONE_TEBIBYTE) || (-val >= UNIT_ONE_TEBIBYTE)) && ((val % UNIT_ONE_TEBIBYTE) == 0)) { + sprintf(outStr, "%qdT", (long long)val / UNIT_ONE_TEBIBYTE); + } else if (((val >= UNIT_ONE_GIBIBYTE) || (-val >= UNIT_ONE_GIBIBYTE)) && ((val % UNIT_ONE_GIBIBYTE) == 0)) { + sprintf(outStr, "%qdG", (long long)val / UNIT_ONE_GIBIBYTE); + } else if (((val >= UNIT_ONE_MEBIBYTE) || (-val >= UNIT_ONE_MEBIBYTE)) && ((val % UNIT_ONE_MEBIBYTE) == 0)) { + sprintf(outStr, "%qdM", (long long)val / UNIT_ONE_MEBIBYTE); + } else if (((val >= UNIT_ONE_KIBIBYTE) || (-val >= UNIT_ONE_KIBIBYTE)) && ((val % UNIT_ONE_KIBIBYTE) == 0)) { + sprintf(outStr, "%qdK", (long long)val / UNIT_ONE_KIBIBYTE); + } else + sprintf(outStr, "%qd", (long long)val); +} + +int32_t taosStrHumanToInt32(const char* str) { + size_t sLen = strlen(str); + if (sLen < 2) return atoll(str); + + int32_t val = 0; + + char* strNoUnit = NULL; + char unit = str[sLen - 1]; + if ((unit == 'G') || (unit == 'g')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_GIBIBYTE; + } else if ((unit == 'M') || (unit == 'm')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_MEBIBYTE; + } else if ((unit == 'K') || (unit == 'k')) { + strNoUnit = taosMemoryCalloc(sLen, 1); + memcpy(strNoUnit, str, sLen - 1); + + val = atoll(strNoUnit) * UNIT_ONE_KIBIBYTE; + } else { + val = atoll(str); + } + + taosMemoryFree(strNoUnit); + return val; +} + +void taosInt32ToHumanStr(int32_t val, char* outStr) { + if (((val >= UNIT_ONE_GIBIBYTE) || (-val >= UNIT_ONE_GIBIBYTE)) && ((val % UNIT_ONE_GIBIBYTE) == 0)) { + sprintf(outStr, "%qdG", (long long)val / UNIT_ONE_GIBIBYTE); + } else if (((val >= UNIT_ONE_MEBIBYTE) || (-val >= UNIT_ONE_MEBIBYTE)) && ((val % UNIT_ONE_MEBIBYTE) == 0)) { + sprintf(outStr, "%qdM", (long long)val / UNIT_ONE_MEBIBYTE); + } else if (((val >= UNIT_ONE_KIBIBYTE) || (-val >= UNIT_ONE_KIBIBYTE)) && ((val % UNIT_ONE_KIBIBYTE) == 0)) { + sprintf(outStr, "%qdK", (long long)val / UNIT_ONE_KIBIBYTE); + } else + sprintf(outStr, "%qd", (long long)val); +}