Skip to content

Commit

Permalink
Merge pull request ClickHouse#72555 from ClickHouse/raise_default_for…
Browse files Browse the repository at this point in the history
…_prealloc_in_ht_optimisation

Raise defaults for preallocation in HTs optimisation
  • Loading branch information
nickitat authored Nov 28, 2024
2 parents 4c36e8f + 863f3fb commit 523d3b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Core/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4312,14 +4312,14 @@ SELECT * FROM x_dist ORDER BY number ASC;
DECLARE(Bool, collect_hash_table_stats_during_aggregation, true, R"(
Enable collecting hash table statistics to optimize memory allocation
)", 0) \
DECLARE(UInt64, max_size_to_preallocate_for_aggregation, 100'000'000, R"(
DECLARE(UInt64, max_size_to_preallocate_for_aggregation, 1'000'000'000'000, R"(
For how many elements it is allowed to preallocate space in all hash tables in total before aggregation
)", 0) \
\
DECLARE(Bool, collect_hash_table_stats_during_joins, true, R"(
Enable collecting hash table statistics to optimize memory allocation
)", 0) \
DECLARE(UInt64, max_size_to_preallocate_for_joins, 100'000'000, R"(
DECLARE(UInt64, max_size_to_preallocate_for_joins, 1'000'000'000'000, R"(
For how many elements it is allowed to preallocate space in all hash tables in total before join
)", 0) \
\
Expand Down
2 changes: 2 additions & 0 deletions src/Core/SettingsChangesHistory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ static std::initializer_list<std::pair<ClickHouseVersion, SettingsChangesHistory
{
{"24.12",
{
{"max_size_to_preallocate_for_aggregation", 100'000'000, 1'000'000'000'000, "Enable optimisation for bigger tables."},
{"max_size_to_preallocate_for_joins", 100'000'000, 1'000'000'000'000, "Enable optimisation for bigger tables."},
{"parallel_replicas_index_analysis_only_on_coordinator", false, true, "Index analysis done only on replica-coordinator and skipped on other replicas. Effective only with enabled parallel_replicas_local_plan"},
{"use_async_executor_for_materialized_views", false, false, "New setting."},
}
Expand Down

0 comments on commit 523d3b4

Please sign in to comment.