Skip to content

Commit 0f0cd0d

Browse files
committed
Prepare SettingsChangesHistory
1 parent 1dfacd4 commit 0f0cd0d

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/Core/SettingsChangesHistory.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,12 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
6666
/// controls new feature and it's 'true' by default, use 'false' as previous_value).
6767
/// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972)
6868
/// Note: please check if the key already exists to prevent duplicate entries.
69+
addSettingsChanges(settings_changes_history, "25.5",
70+
{
71+
});
6972
addSettingsChanges(settings_changes_history, "25.4",
7073
{
74+
/// Release closed. Please use 25.5
7175
{"allow_materialized_view_with_bad_select", true, false, "Don't allow creating MVs referencing nonexistent columns or tables"},
7276
{"query_plan_optimize_lazy_materialization", false, true, "Added new setting to use query plan for lazy materialization optimisation"},
7377
{"query_plan_max_limit_for_lazy_materialization", 10, 10, "Added new setting to control maximum limit value that allows to use query plan for lazy materialization optimisation. If zero, there is no limit"},
@@ -81,6 +85,7 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
8185
{"distributed_cache_read_request_max_tries", 20, 20, "New setting"},
8286
{"min_os_cpu_wait_time_ratio_to_throw", 0, 2, "New setting"},
8387
{"max_os_cpu_wait_time_ratio_to_throw", 0, 6, "New setting"},
88+
/// Release closed. Please use 25.5
8489
});
8590
addSettingsChanges(settings_changes_history, "25.3",
8691
{
@@ -701,13 +706,18 @@ const VersionToSettingsChangesMap & getMergeTreeSettingsChangesHistory()
701706
static std::once_flag initialized_flag;
702707
std::call_once(initialized_flag, [&]
703708
{
709+
addSettingsChanges(merge_tree_settings_changes_history, "25.5",
710+
{
711+
});
704712
addSettingsChanges(merge_tree_settings_changes_history, "25.4",
705713
{
714+
/// Release closed. Please use 25.5
706715
{"max_merge_delayed_streams_for_parallel_write", 1000, 100, "New setting"},
707716
{"max_postpone_time_for_failed_replicated_fetches_ms", 1ULL * 60 * 1000, 1ULL * 60 * 1000, "Added new setting to enable postponing fetch tasks in the replication queue."},
708717
{"max_postpone_time_for_failed_replicated_merges_ms", 1ULL * 60 * 1000, 1ULL * 60 * 1000, "Added new setting to enable postponing merge tasks in the replication queue."},
709718
{"max_postpone_time_for_failed_replicated_tasks_ms", 5ULL * 60 * 1000, 5ULL * 60 * 1000, "Added new setting to enable postponing tasks in the replication queue."},
710719
{"allow_summing_columns_in_partition_or_order_key", true, false, "New setting to allow summing of partition or sorting key columns"},
720+
/// Release closed. Please use 25.5
711721
});
712722
addSettingsChanges(merge_tree_settings_changes_history, "25.3",
713723
{

0 commit comments

Comments
 (0)