From 8ed37801ca869b6754a0b047ceec28cc7d1cbefb Mon Sep 17 00:00:00 2001 From: Vladimir Chebotarev Date: Fri, 29 Nov 2019 08:12:01 +0300 Subject: [PATCH] Finally fixed selection of destination of move TTL. --- dbms/src/Storages/MergeTree/MergeTreeData.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.cpp b/dbms/src/Storages/MergeTree/MergeTreeData.cpp index f7b484e5886..03dfa8a64d8 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeData.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeData.cpp @@ -3728,17 +3728,17 @@ const MergeTreeData::TTLEntry * MergeTreeData::selectMoveDestination( { const MergeTreeData::TTLEntry * result = nullptr; /// Prefer TTL rule which went into action last. - time_t max_min_ttl = 0; + time_t max_max_ttl = 0; for (const auto & ttl_entry : move_ttl_entries) { auto ttl_info_it = ttl_infos.moves_ttl.find(ttl_entry.result_column); if (ttl_info_it != ttl_infos.moves_ttl.end() - && ttl_info_it->second.min <= minimum_time - && max_min_ttl <= ttl_info_it->second.min) + && ttl_info_it->second.max <= minimum_time + && max_max_ttl >= ttl_info_it->second.max) { result = &ttl_entry; - max_min_ttl = ttl_info_it->second.min; + max_max_ttl = ttl_info_it->second.max; } }