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 17:32:18 +08:00
parent 8610a85878
commit 37e39cce69
5 changed files with 5 additions and 4 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_BOTH, CFG_CATEGORY_GLOBAL)); CFG_DYN_BOTH, CFG_CATEGORY_LOCAL));
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,

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

@ -222,7 +222,7 @@ class TDTestCase:
tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'") tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'")
tdLog.info(len(tdSql.queryResult)) tdLog.info(len(tdSql.queryResult))
tdSql.checkEqual(True, len(tdSql.queryResult) in range(282, 283)) tdSql.checkEqual(True, len(tdSql.queryResult) in range(283, 284))
tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'") tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'")
tdSql.checkEqual(56, len(tdSql.queryResult)) tdSql.checkEqual(56, len(tdSql.queryResult))

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 all dnodes "countAlwaysReturnValue" "0"') tdSql.execute('alter local "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 all dnodes "countAlwaysReturnValue" "0"') tdSql.execute('alter local "countAlwaysReturnValue" "0"')
tdLog.printNoPrefix("==========step2:test results ==============") tdLog.printNoPrefix("==========step2:test results ==============")

1
tests/system-test/7-tmq/tmqMaxTopic.py
View File

@ -156,6 +156,7 @@ class TDTestCase:
alterSql = "alter all dnodes 'tmqMaxTopicNum' '22'" alterSql = "alter all dnodes 'tmqMaxTopicNum' '22'"
tdLog.info("alter all dnodes 'tmqMaxTopicNum' '22'") tdLog.info("alter all dnodes 'tmqMaxTopicNum' '22'")
tdSql.execute(alterSql) tdSql.execute(alterSql)
newTmqMaxTopicNum = 22
sqlString = "create topic %s%s as %s" %(topicNamePrefix, 'x', queryString) sqlString = "create topic %s%s as %s" %(topicNamePrefix, 'x', queryString)
tdLog.info("create topic sql: %s"%sqlString) tdLog.info("create topic sql: %s"%sqlString)