Merge 3f95bade2a into 44b4bd38b9

src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp

@@ -41,6 +41,7 @@
 #include <cmath>
 #include <ctime>
 #include <numeric>
+#include <ranges>
 
 #include <boost/algorithm/string/replace.hpp>
 
@@ -388,12 +389,12 @@ MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPo
 
     const String * prev_partition_id = nullptr;
     /// Previous part only in boundaries of partition frame
-    const MergeTreeData::DataPartPtr * prev_part = nullptr;
+    const MergeTreeData::DataPartPtr * next_part = nullptr;
 
     /// collect min_age for each partition while iterating parts
     PartitionsInfo & partitions_info = res.partitions_info;
 
-    for (const MergeTreeData::DataPartPtr & part : data_parts)
+    for (const MergeTreeData::DataPartPtr & part : data_parts | std::views::reverse)
     {
         const String & partition_id = part->info.partition_id;
 
@@ -404,11 +405,11 @@ MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPo
 
             /// New partition frame.
             prev_partition_id = &partition_id;
-            prev_part = nullptr;
+            next_part = nullptr;
         }
 
         /// Check predicate only for the first part in each range.
-        if (!prev_part)
+        if (!next_part)
         {
             /* Parts can be merged with themselves for TTL needs for example.
             * So we have to check if this part is currently being inserted with quorum and so on and so forth.
@@ -426,10 +427,10 @@ MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPo
         {
             /// If we cannot merge with previous part we had to start new parts
             /// interval (in the same partition)
-            if (!can_merge_callback(*prev_part, part, txn.get(), out_disable_reason))
+            if (!can_merge_callback(*next_part, part, txn.get(), out_disable_reason))
             {
                 /// Now we have no previous part
-                prev_part = nullptr;
+                next_part = nullptr;
 
                 /// Mustn't be empty
                 assert(!parts_ranges.back().empty());
@@ -463,18 +464,22 @@ MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPo
         parts_ranges.back().emplace_back(part_info);
 
         /// Check for consistency of data parts. If assertion is failed, it requires immediate investigation.
-        if (prev_part)
+        if (next_part)
         {
-            if (part->info.contains((*prev_part)->info))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} contains previous part {}", part->name, (*prev_part)->name);
+            if (part->info.contains((*next_part)->info))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} contains previous part {}", part->name, (*next_part)->name);
 
-            if (!part->info.isDisjoint((*prev_part)->info))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects previous part {}", part->name, (*prev_part)->name);
+            if (!part->info.isDisjoint((*next_part)->info))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects previous part {}", part->name, (*next_part)->name);
         }
 
-        prev_part = &part;
+        next_part = &part;
     }
 
+    for (auto & range : res.parts_ranges)
+        std::reverse(range.begin(), range.end());
+
+    std::reverse(res.parts_ranges.begin(), res.parts_ranges.end());
     ProfileEvents::increment(ProfileEvents::MergerMutatorPartsInRangesForMergeCount, res.parts_selected_precondition);
     ProfileEvents::increment(ProfileEvents::MergerMutatorRangesForMergeCount, res.parts_ranges.size());
     ProfileEvents::increment(ProfileEvents::MergerMutatorPrepareRangesForMergeElapsedMicroseconds, ranges_for_merge_timer.elapsedMicroseconds());

src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp

@@ -2488,7 +2488,12 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::operator()(
     PreformattedMessage & out_reason) const
 {
     if (left)
+    {
+        if (left->info.min_block < right->info.min_block)
             return canMergeTwoParts(left, right, out_reason);
+        else
+            return canMergeTwoParts(right, left, out_reason);
+    }
     return canMergeSinglePart(right, out_reason);
 }
 

src/Storages/StorageMergeTree.cpp

@@ -1003,8 +1003,28 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
     CurrentlyMergingPartsTaggerPtr merging_tagger;
     MergeList::EntryPtr merge_entry;
 
-    auto can_merge = [this, &lock](const DataPartPtr & left, const DataPartPtr & right, const MergeTreeTransaction * tx, PreformattedMessage & disable_reason) -> bool
+    auto can_merge = [this, &lock](const DataPartPtr & left_, const DataPartPtr & right_, const MergeTreeTransaction * tx, PreformattedMessage & disable_reason) -> bool
     {
+        DataPartPtr left{nullptr}, right{nullptr};
+
+        if (left_)
+        {
+            if (left_->info.min_block > right_->info.min_block)
+            {
+                left = right_;
+                right = left_;
+            }
+            else
+            {
+                left = left_;
+                right = right_;
+            }
+        }
+        else
+        {
+            right = right_;
+        }
+
         if (tx)
         {
             /// Cannot merge parts if some of them are not visible in current snapshot