From f3e64fd69c0dfed3381a42c26fcc29819bd2fb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= Date: Mon, 28 Oct 2024 18:35:02 +0100 Subject: [PATCH] Disallow using DEPRECATED settings --- src/Storages/MergeTree/MergeTreeData.cpp | 5 +---- utils/check-style/check-settings-style | 9 ++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp index 8611681a976..e1d363b3812 100644 --- a/src/Storages/MergeTree/MergeTreeData.cpp +++ b/src/Storages/MergeTree/MergeTreeData.cpp @@ -207,12 +207,10 @@ namespace MergeTreeSetting extern const MergeTreeSettingsUInt64 max_projections; extern const MergeTreeSettingsUInt64 max_suspicious_broken_parts_bytes; extern const MergeTreeSettingsUInt64 max_suspicious_broken_parts; - extern const MergeTreeSettingsUInt64 min_bytes_for_compact_part; extern const MergeTreeSettingsUInt64 min_bytes_for_wide_part; extern const MergeTreeSettingsUInt64 min_bytes_to_rebalance_partition_over_jbod; extern const MergeTreeSettingsUInt64 min_delay_to_insert_ms; extern const MergeTreeSettingsUInt64 min_delay_to_mutate_ms; - extern const MergeTreeSettingsUInt64 min_rows_for_compact_part; extern const MergeTreeSettingsUInt64 min_rows_for_wide_part; extern const MergeTreeSettingsUInt64 number_of_mutations_to_delay; extern const MergeTreeSettingsUInt64 number_of_mutations_to_throw; @@ -8360,8 +8358,7 @@ bool MergeTreeData::canUsePolymorphicParts(const MergeTreeSettings & settings, S { if (!canUseAdaptiveGranularity()) { - if ((settings[MergeTreeSetting::min_rows_for_wide_part] != 0 || settings[MergeTreeSetting::min_bytes_for_wide_part] != 0 - || settings[MergeTreeSetting::min_rows_for_compact_part] != 0 || settings[MergeTreeSetting::min_bytes_for_compact_part] != 0)) + if (settings[MergeTreeSetting::min_rows_for_wide_part] != 0 || settings[MergeTreeSetting::min_bytes_for_wide_part] != 0) { out_reason = fmt::format( "Table can't create parts with adaptive granularity, but settings" diff --git a/utils/check-style/check-settings-style b/utils/check-style/check-settings-style index af06509b63f..915428e9a31 100755 --- a/utils/check-style/check-settings-style +++ b/utils/check-style/check-settings-style @@ -86,11 +86,10 @@ done # Find missing declarations (obsolete settings being used) # Note that SettingsDeclaration are first in the file -# Disabled for now pending fixing the code -#awk '{print $1 " " $3}' "${SETTINGS_FILE}" | awk '{if (!seen[$1]++) print $0}' | grep -v SettingsDeclaration | while read -r setting; -#do -# echo "Could not find setting (maybe obsolete?) $setting" -#done +awk '{print $1 " " $3}' "${SETTINGS_FILE}" | awk '{if (!seen[$1]++) print $0}' | grep -v SettingsDeclaration | while read -r setting; +do + echo "Could not find setting (maybe obsolete?) $setting" +done # Look for settings declared with multiple types # This works based on the fact that the if the setting declaration and usage have different types then the pair