thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

merging with master

Browse Source
This commit is contained in:
CurtizJ 2019-08-26 22:49:52 +03:00
parent 1774ac4b9e
commit 5f25c2d7b4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
View File

@ -213,7 +213,7 @@ bool MergeTreeDataMergerMutator::selectPartsToMerge(
part_info.min_ttl = part->ttl_infos.part_min_ttl;
part_info.max_ttl = part->ttl_infos.part_max_ttl;
time_t ttl = data.settings.ttl_only_drop_parts ? part_info.max_ttl : part_info.min_ttl;
time_t ttl = data_settings->ttl_only_drop_parts ? part_info.max_ttl : part_info.min_ttl;
if (ttl && ttl <= current_time)
has_part_with_expired_ttl = true;
@ -242,7 +242,7 @@ bool MergeTreeDataMergerMutator::selectPartsToMerge(
/// NOTE Could allow selection of different merge strategy.
if (can_merge_with_ttl && has_part_with_expired_ttl && !ttl_merges_blocker.isCancelled())
{
merge_selector = std::make_unique<TTLMergeSelector>(current_time, data.settings.ttl_only_drop_parts);
merge_selector = std::make_unique<TTLMergeSelector>(current_time, data_settings->ttl_only_drop_parts);
last_merge_with_ttl = current_time;
}
else