Merge pull request ClickHouse#80511 from ClickHouse/davenger-patch-3

Rename some new experimental settings

Author: davenger

src/Client/BuzzHouse/Generator/ServerSettings.cpp

@@ -272,9 +272,9 @@ std::unordered_map<String, CHSetting> serverSettings = {
     {"decimal_check_overflow", CHSetting(trueOrFalse, {}, false)},
     /// {"deduplicate_blocks_in_dependent_materialized_views", CHSetting(trueOrFalse, {}, false)},
     /// {"describe_compact_output", CHSetting(trueOrFalse, {}, false)},
-    {"default_reader_bucket_count",
+    {"distributed_plan_default_reader_bucket_count",
      CHSetting([](RandomGenerator & rg) { return std::to_string(rg.thresholdGenerator<uint32_t>(0.2, 0.2, 0, 128)); }, {}, false)},
-    {"default_shuffle_join_bucket_count",
+    {"distributed_plan_default_shuffle_join_bucket_count",
      CHSetting([](RandomGenerator & rg) { return std::to_string(rg.thresholdGenerator<uint32_t>(0.2, 0.2, 0, 128)); }, {}, false)},
     {"describe_extend_object_types", CHSetting(trueOrFalse, {}, false)},
     {"describe_include_subcolumns", CHSetting(trueOrFalse, {}, false)},
@@ -331,7 +331,7 @@ std::unordered_map<String, CHSetting> serverSettings = {
     {"engine_file_skip_empty_files", CHSetting(trueOrFalse, {}, false)},
     {"engine_url_skip_empty_files", CHSetting(trueOrFalse, {}, false)},
     {"exact_rows_before_limit", CHSetting(trueOrFalse, {"0", "1"}, false)},
-    {"execute_distributed_plan_locally", CHSetting(trueOrFalse, {}, false)},
+    {"distributed_plan_execute_locally", CHSetting(trueOrFalse, {}, false)},
     /// {"external_table_functions_use_nulls", CHSetting(trueOrFalse, {}, false)},
     /// {"external_table_strict_query", CHSetting(trueOrFalse, {}, true)},
     {"extremes", CHSetting(trueOrFalse, {}, false)},
@@ -363,7 +363,7 @@ std::unordered_map<String, CHSetting> serverSettings = {
     {"final", CHSetting(trueOrFalse, {}, false)},
     {"flatten_nested", CHSetting(trueOrFalse, {"0", "1"}, false)},
     {"force_aggregate_partitions_independently", CHSetting(trueOrFalse, {"0", "1"}, false)},
-    {"force_exchange_kind",
+    {"distributed_plan_force_exchange_kind",
      CHSetting(
          [](RandomGenerator & rg)
          {
@@ -593,7 +593,7 @@ static std::unordered_map<String, CHSetting> serverSettings2 = {
     {"mysql_map_fixed_string_to_text_in_show_columns", CHSetting(trueOrFalse, {}, false)},
     {"mysql_map_string_to_text_in_show_columns", CHSetting(trueOrFalse, {}, false)},
     {"optimize_count_from_files", CHSetting(trueOrFalse, {"0", "1"}, false)},
-    {"optimize_exchanges", CHSetting(trueOrFalse, {}, false)},
+    {"distributed_plan_optimize_exchanges", CHSetting(trueOrFalse, {}, false)},
     {"optimize_extract_common_expressions", CHSetting(trueOrFalse, {"0", "1"}, false)},
     {"optimize_on_insert", CHSetting(trueOrFalse, {"0", "1"}, false)},
     {"optimize_or_like_chain", CHSetting(trueOrFalse, {"0", "1"}, false)},

src/Core/Settings.cpp

@@ -6716,19 +6716,19 @@ Allow experimental delta-kernel-rs implementation.
     DECLARE(Bool, make_distributed_plan, false, R"(
 Make distributed query plan.
 )", EXPERIMENTAL) \
-    DECLARE(Bool, execute_distributed_plan_locally, false, R"(
+    DECLARE(Bool, distributed_plan_execute_locally, false, R"(
 Run all tasks of a distributed query plan locally. Useful for testing and debugging.
 )", EXPERIMENTAL) \
-    DECLARE(UInt64, default_shuffle_join_bucket_count, 8, R"(
+    DECLARE(UInt64, distributed_plan_default_shuffle_join_bucket_count, 8, R"(
 Default number of buckets for distributed shuffle-hash-join.
 )", EXPERIMENTAL) \
-    DECLARE(UInt64, default_reader_bucket_count, 8, R"(
+    DECLARE(UInt64, distributed_plan_default_reader_bucket_count, 8, R"(
 Default number of tasks for parallel reading in distributed query. Tasks are spread across between replicas.
 )", EXPERIMENTAL) \
-    DECLARE(Bool, optimize_exchanges, false, R"(
+    DECLARE(Bool, distributed_plan_optimize_exchanges, true, R"(
 Removes unnecessary exchanges in distributed query plan. Disable it for debugging.
-)", EXPERIMENTAL) \
-    DECLARE(String, force_exchange_kind, "", R"(
+)", 0) \
+    DECLARE(String, distributed_plan_force_exchange_kind, "", R"(
 Force specified kind of Exchange operators between distributed query stages.
 
 Possible values:

src/Core/SettingsChangesHistory.cpp

@@ -92,11 +92,11 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
             {"min_os_cpu_wait_time_ratio_to_throw", 0, 0, "Setting values were changed and backported to 25.4"},
             {"max_os_cpu_wait_time_ratio_to_throw", 0, 0, "Setting values were changed and backported to 25.4"},
             {"make_distributed_plan", 0, 0, "New experimental setting."},
-            {"execute_distributed_plan_locally", 0, 0, "New experimental setting."},
-            {"default_shuffle_join_bucket_count", 8, 8, "New experimental setting."},
-            {"default_reader_bucket_count", 8, 8, "New experimental setting."},
-            {"optimize_exchanges", 0, 0, "New experimental setting."},
-            {"force_exchange_kind", "", "", "New experimental setting."},
+            {"distributed_plan_execute_locally", 0, 0, "New experimental setting."},
+            {"distributed_plan_default_shuffle_join_bucket_count", 8, 8, "New experimental setting."},
+            {"distributed_plan_default_reader_bucket_count", 8, 8, "New experimental setting."},
+            {"distributed_plan_optimize_exchanges", true, true, "New experimental setting."},
+            {"distributed_plan_force_exchange_kind", "", "", "New experimental setting."},
             {"update_sequential_consistency", true, true, "A new setting"},
             {"update_parallel_mode", "auto", "auto", "A new setting"},
             {"lightweight_delete_mode", "alter_update", "alter_update", "A new setting"},