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

Merge pull request #44021 from ClickHouse/fix-timeout-overflow

Browse Source 
Fix relaxed "too many parts" threshold
This commit is contained in:
Alexey Milovidov 2022-12-09 00:20:08 +03:00 committed by GitHub
commit 124446463c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3675,13 +3675,13 @@ void MergeTreeData::delayInsertOrThrowIfNeeded(Poco::Event * until, ContextPtr q
parts_count_in_partition, ReadableSize(average_part_size)); parts_count_in_partition, ReadableSize(average_part_size));
} }
if (k_inactive < 0 && parts_count_in_partition < parts_to_delay_insert) if (k_inactive < 0 && (parts_count_in_partition < parts_to_delay_insert || parts_are_large_enough_in_average))
return; return;
const ssize_t k_active = ssize_t(parts_count_in_partition) - ssize_t(parts_to_delay_insert); const ssize_t k_active = ssize_t(parts_count_in_partition) - ssize_t(parts_to_delay_insert);
size_t max_k; size_t max_k;
size_t k; size_t k;
if (k_active > k_inactive && !parts_are_large_enough_in_average) if (k_active > k_inactive)
{ {
max_k = parts_to_throw_insert - parts_to_delay_insert; max_k = parts_to_throw_insert - parts_to_delay_insert;
k = k_active + 1; k = k_active + 1;