This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 726658a4a97a4d017cbc1680e1c28c5699cac10b Author: AlexYue <[email protected]> AuthorDate: Fri Sep 1 11:28:26 2023 +0800 [enhance] use correct default value for show config action (#19284) --- be/src/common/config.cpp | 6 +++++- .../suites/compaction/test_compaction_cumu_delete.groovy | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index b15a395a29..9bc477c27a 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -1503,7 +1503,11 @@ std::vector<std::vector<std::string>> get_config_info() { _config.push_back(it.first); _config.push_back(field_it->second.type); - _config.push_back(it.second); + if (0 == strcmp(field_it->second.type, "bool")) { + _config.push_back(it.second == "1" ? "true" : "false"); + } else { + _config.push_back(it.second); + } _config.push_back(field_it->second.valmutable ? "true" : "false"); configs.push_back(_config); diff --git a/regression-test/suites/compaction/test_compaction_cumu_delete.groovy b/regression-test/suites/compaction/test_compaction_cumu_delete.groovy index 5d24f4adfe..31f1331969 100644 --- a/regression-test/suites/compaction/test_compaction_cumu_delete.groovy +++ b/regression-test/suites/compaction/test_compaction_cumu_delete.groovy @@ -50,13 +50,23 @@ suite("test_compaction_cumu_delete") { assert configList instanceof List boolean disableAutoCompaction = true + boolean allowDeleteWhenCumu = false for (Object ele in (List) configList) { assert ele instanceof List<String> if (((List<String>) ele)[0] == "disable_auto_compaction") { disableAutoCompaction = Boolean.parseBoolean(((List<String>) ele)[2]) } + if (((List<String>) ele)[0] == "enable_delete_when_cumu_compaction") { + allowDeleteWhenCumu = Boolean.parseBoolean(((List<String>) ele)[2]) + } + } + + if (!allowDeleteWhenCumu) { + logger.info("Skip test compaction when cumu compaction because not enabled this config") + return } + def triggerCompaction = { be_host, be_http_port, compact_type -> // trigger compactions for all tablets in ${tableName} String tablet_id = tablet[0] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
