diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h index 9bda3578906..673105b3ed4 100644 --- a/src/Storages/MergeTree/MergeTreeSettings.h +++ b/src/Storages/MergeTree/MergeTreeSettings.h @@ -56,7 +56,7 @@ struct Settings; M(UInt64, write_ahead_log_interval_ms_to_fsync, 100, "Interval in milliseconds after which fsync for WAL is being done.", 0) \ M(Bool, in_memory_parts_insert_sync, false, "If true insert of part with in-memory format will wait for fsync of WAL", 0) \ M(UInt64, non_replicated_deduplication_window, 0, "How many last blocks of hashes should be kept on disk (0 - disabled).", 0) \ - M(UInt64, max_parts_to_merge_at_once, 100, "Max amout of parts which can be merged at once (0 - disabled). Doesn't affect OPTIMIZE FINAL query.", 0) \ + M(UInt64, max_parts_to_merge_at_once, 100, "Max amount of parts which can be merged at once (0 - disabled). Doesn't affect OPTIMIZE FINAL query.", 0) \ \ /** Inserts settings. */ \ M(UInt64, parts_to_delay_insert, 150, "If table contains at least that many active parts in single partition, artificially slow down insert into table.", 0) \ diff --git a/src/Storages/MergeTree/SimpleMergeSelector.h b/src/Storages/MergeTree/SimpleMergeSelector.h index 2e6ea3513fd..af339dbfa24 100644 --- a/src/Storages/MergeTree/SimpleMergeSelector.h +++ b/src/Storages/MergeTree/SimpleMergeSelector.h @@ -88,7 +88,7 @@ class SimpleMergeSelector final : public IMergeSelector public: struct Settings { - /// Zero means unlimited. Can be overriden by the same merge tree setting. + /// Zero means unlimited. Can be overridden by the same merge tree setting. size_t max_parts_to_merge_at_once = 100; /** Minimum ratio of size of one part to all parts in set of parts to merge (for usual cases). diff --git a/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference index c155c53432a..30a4d52afe1 100644 --- a/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference +++ b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference @@ -1,2 +1,2 @@ -250 +100 1 diff --git a/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql index 1d12f0ef2ec..d6cde1ef7a8 100644 --- a/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql +++ b/tests/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql @@ -14,7 +14,7 @@ SETTINGS max_parts_to_merge_at_once = 3; SYSTEM STOP MERGES limited_merge_table; -INSERT INTO limited_merge_table SELECT number FROM numbers(250); +INSERT INTO limited_merge_table SELECT number FROM numbers(100); SYSTEM START MERGES limited_merge_table;