thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f3e64fd69c into 44b4bd38b9

Browse Source
This commit is contained in:
Raúl Marín 2024-11-21 00:10:02 +01:00 committed by GitHub
commit 9101343d45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -211,12 +211,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;
@ -8454,8 +8452,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"

9
utils/check-style/check-settings-style
View File

@ -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