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

Fix some ci errors.

This commit is contained in:
xiao-77 2024-11-28 10:22:16 +08:00
parent 377461152b
commit 5416e73203
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,7 +701,7 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
TAOS_CHECK_RETURN(cfgAddBool(pCfg, "multiResultFunctionStarReturnTags", tsMultiResultFunctionStarReturnTags, TAOS_CHECK_RETURN(cfgAddBool(pCfg, "multiResultFunctionStarReturnTags", tsMultiResultFunctionStarReturnTags,
CFG_SCOPE_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL)); CFG_SCOPE_CLIENT, CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "countAlwaysReturnValue", tsCountAlwaysReturnValue, 0, 1, CFG_SCOPE_BOTH, TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "countAlwaysReturnValue", tsCountAlwaysReturnValue, 0, 1, CFG_SCOPE_BOTH,
CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL)); CFG_DYN_BOTH, CFG_CATEGORY_GLOBAL));
TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxTsmaCalcDelay", tsMaxTsmaCalcDelay, 600, 86400, CFG_SCOPE_CLIENT, TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "maxTsmaCalcDelay", tsMaxTsmaCalcDelay, 600, 86400, CFG_SCOPE_CLIENT,
CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL)); CFG_DYN_CLIENT, CFG_CATEGORY_LOCAL));
TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "tsmaDataDeleteMark", tsmaDataDeleteMark, 60 * 60 * 1000, INT64_MAX, TAOS_CHECK_RETURN(cfgAddInt32(pCfg, "tsmaDataDeleteMark", tsmaDataDeleteMark, 60 * 60 * 1000, INT64_MAX,

13
source/dnode/mnode/impl/src/mndConfig.c
View File

@ -468,6 +468,7 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
SDCfgDnodeReq dcfgReq = {0}; SDCfgDnodeReq dcfgReq = {0};
if (strcasecmp(cfgReq.config, "resetlog") == 0) { if (strcasecmp(cfgReq.config, "resetlog") == 0) {
(void)strcpy(dcfgReq.config, "resetlog"); (void)strcpy(dcfgReq.config, "resetlog");
goto _send_req;
#ifdef TD_ENTERPRISE #ifdef TD_ENTERPRISE
} else if (strncasecmp(cfgReq.config, "s3blocksize", 11) == 0) { } else if (strncasecmp(cfgReq.config, "s3blocksize", 11) == 0) {
int32_t optLen = strlen("s3blocksize"); int32_t optLen = strlen("s3blocksize");
@ -511,12 +512,14 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) {
if (pItem->category == CFG_CATEGORY_GLOBAL) { if (pItem->category == CFG_CATEGORY_GLOBAL) {
TAOS_CHECK_GOTO(mndConfigUpdateTrans(pMnode, dcfgReq.config, dcfgReq.value), &lino, _err_out); TAOS_CHECK_GOTO(mndConfigUpdateTrans(pMnode, dcfgReq.config, dcfgReq.value), &lino, _err_out);
} }
{ // audit _send_req :
char obj[50] = {0};
(void)sprintf(obj, "%d", cfgReq.dnodeId);
auditRecord(pReq, pMnode->clusterId, "alterDnode", obj, "", cfgReq.sql, cfgReq.sqlLen); { // audit
} char obj[50] = {0};
(void)sprintf(obj, "%d", cfgReq.dnodeId);
auditRecord(pReq, pMnode->clusterId, "alterDnode", obj, "", cfgReq.sql, cfgReq.sqlLen);
}
tFreeSMCfgDnodeReq(&cfgReq); tFreeSMCfgDnodeReq(&cfgReq);

2
tests/system-test/0-others/show.py
View File

@ -288,7 +288,7 @@ class TDTestCase:
vals = ['9223372036854775807', '9223372036854775807.1', '9223372036854775806', '9223372036854775808', '9223372036854775808.1', '9223372036854775807.0', '9223372036854775806.1'] vals = ['9223372036854775807', '9223372036854775807.1', '9223372036854775806', '9223372036854775808', '9223372036854775808.1', '9223372036854775807.0', '9223372036854775806.1']
expected_vals = ['9223372036854775807', 'err', '9223372036854775806', 'err', 'err', 'err', 'err'] expected_vals = ['9223372036854775807', 'err', '9223372036854775806', 'err', 'err', 'err', 'err']
for val_str, expected_val in zip(vals, expected_vals): for val_str, expected_val in zip(vals, expected_vals):
sql = f'ALTER dnode 1 "{var}" "{val_str}"' sql = f'ALTER all dnodes "{var}" "{val_str}"'
if expected_val == 'err': if expected_val == 'err':
tdSql.error(sql) tdSql.error(sql)
else: else:

2
tests/system-test/2-query/agg_group_NotReturnValue.py
View File

@ -1588,7 +1588,7 @@ class TDTestCase(TDTestCase):
self.dropandcreateDB_random("nested", 1) self.dropandcreateDB_random("nested", 1)
self.modify_tables() self.modify_tables()
tdSql.execute('alter local "countAlwaysReturnValue" "0"') tdSql.execute('alter all dnodes "countAlwaysReturnValue" "0"')
self.tag_count_all() self.tag_count_all()
self.tbname_count_all() self.tbname_count_all()

2
tests/system-test/2-query/countAlwaysReturnValue.py
View File

@ -168,7 +168,7 @@ class TDTestCase:
tdLog.printNoPrefix("==========step1:prepare data ==============") tdLog.printNoPrefix("==========step1:prepare data ==============")
self.prepare_data() self.prepare_data()
tdSql.execute('alter local "countAlwaysReturnValue" "0"') tdSql.execute('alter all dnodes "countAlwaysReturnValue" "0"')
tdLog.printNoPrefix("==========step2:test results ==============") tdLog.printNoPrefix("==========step2:test results ==============")

2
tests/system-test/2-query/db.py
View File

@ -47,7 +47,7 @@ class TDTestCase:
def case2(self): def case2(self):
tdSql.query("show variables") tdSql.query("show variables")
tdSql.checkRows(9) tdSql.checkRows(95)
for i in range(self.replicaVar): for i in range(self.replicaVar):
tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1)) tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1))