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

fix: config variable rename to tsCompareAsStrInGreatest

This commit is contained in:
factosea 2025-03-08 13:54:00 +08:00
parent 0959423d5b
commit 1d707a4318
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/tglobal.h
View File

@ -299,7 +299,7 @@ extern bool tsStreamCoverage;
extern int8_t tsS3EpNum; extern int8_t tsS3EpNum;
extern int32_t tsStreamNotifyMessageSize; extern int32_t tsStreamNotifyMessageSize;
extern int32_t tsStreamNotifyFrameSize; extern int32_t tsStreamNotifyFrameSize;
extern bool tsTransToStrWhenMixTypeInLeast; extern bool tsCompareAsStrInGreatest;
extern bool tsExperimental; extern bool tsExperimental;
// #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize) // #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)

10
source/common/src/tglobal.c
View File

@ -130,7 +130,7 @@ uint32_t tsEncryptionKeyChksum = 0;
int8_t tsEncryptionKeyStat = ENCRYPT_KEY_STAT_UNSET; int8_t tsEncryptionKeyStat = ENCRYPT_KEY_STAT_UNSET;
int8_t tsGrant = 1; int8_t tsGrant = 1;
bool tsTransToStrWhenMixTypeInLeast = true; bool tsCompareAsStrInGreatest = true;
// monitor // monitor
bool tsEnableMonitor = true; bool tsEnableMonitor = true;
@ -749,7 +749,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
TAOS_CHECK_RETURN( TAOS_CHECK_RETURN(
cfgAddBool(pCfg, "streamCoverage", tsStreamCoverage, CFG_DYN_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL)); cfgAddBool(pCfg, "streamCoverage", tsStreamCoverage, CFG_DYN_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(cfgAddBool(pCfg, "transToStrWhenMixTypeInLeast", tsTransToStrWhenMixTypeInLeast, CFG_SCOPE_CLIENT, CFG_DYN_CLIENT,CFG_CATEGORY_LOCAL)); TAOS_CHECK_RETURN(cfgAddBool(pCfg, "compareAsStrInGreatest", tsCompareAsStrInGreatest, CFG_SCOPE_CLIENT, CFG_DYN_CLIENT,CFG_CATEGORY_LOCAL));
TAOS_RETURN(TSDB_CODE_SUCCESS); TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
@ -1484,8 +1484,8 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "streamCoverage"); TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "streamCoverage");
tsStreamCoverage = pItem->bval; tsStreamCoverage = pItem->bval;
TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "transToStrWhenMixTypeInLeast"); TAOS_CHECK_GET_CFG_ITEM(pCfg, pItem, "compareAsStrInGreatest");
tsTransToStrWhenMixTypeInLeast = pItem->bval; tsCompareAsStrInGreatest = pItem->bval;
TAOS_RETURN(TSDB_CODE_SUCCESS); TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
@ -2791,7 +2791,7 @@ static int32_t taosCfgDynamicOptionsForClient(SConfig *pCfg, const char *name) {
{"bypassFlag", &tsBypassFlag}, {"bypassFlag", &tsBypassFlag},
{"safetyCheckLevel", &tsSafetyCheckLevel}, {"safetyCheckLevel", &tsSafetyCheckLevel},
{"streamCoverage", &tsStreamCoverage}, {"streamCoverage", &tsStreamCoverage},
{"transToStrWhenMixTypeInLeast", &tsTransToStrWhenMixTypeInLeast}}; {"compareAsStrInGreatest", &tsCompareAsStrInGreatest}};
if ((code = taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true)) != TSDB_CODE_SUCCESS) { if ((code = taosCfgSetOption(debugOptions, tListLen(debugOptions), pItem, true)) != TSDB_CODE_SUCCESS) {
code = taosCfgSetOption(options, tListLen(options), pItem, false); code = taosCfgSetOption(options, tListLen(options), pItem, false);

2
source/libs/function/src/builtins.c
View File

@ -1754,7 +1754,7 @@ static int32_t translateGreatestleast(SFunctionNode* pFunc, char* pErrBuf, int32
return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName); return invaildFuncParaNumErrMsg(pErrBuf, len, pFunc->functionName);
} }
bool mixTypeToStrings = tsTransToStrWhenMixTypeInLeast; bool mixTypeToStrings = tsCompareAsStrInGreatest;
SDataType res = {.type = 0}; SDataType res = {.type = 0};
bool resInit = false; bool resInit = false;