From 32a20f4433c7fa8a5b6c517ff934cab8da3670c9 Mon Sep 17 00:00:00 2001
From: Han Mertens <hanmertens@outlook.com>
Date: Fri, 15 Jan 2021 21:50:05 +0100
Subject: [PATCH] Change rebuild heuristic in BinaryHeap::append
See #77433 for why the new heuristic was chosen.
Fixes #77433
---
library/alloc/src/collections/binary_heap.rs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/library/alloc/src/collections/binary_heap.rs b/library/alloc/src/collections/binary_heap.rs
index 76051d9e1df..4dfdbe0a5b4 100644
--- a/library/alloc/src/collections/binary_heap.rs
+++ b/library/alloc/src/collections/binary_heap.rs
@@ -630,10 +630,16 @@ impl<T: Ord> BinaryHeap<T> {
// and about 2 * (len1 + len2) comparisons in the worst case
// while `extend` takes O(len2 * log(len1)) operations
// and about 1 * len2 * log_2(len1) comparisons in the worst case,
- // assuming len1 >= len2.
+ // assuming len1 >= len2. For larger heaps, the crossover point
+ // no longer follows this reasoning and was determined empirically.
#[inline]
fn better_to_rebuild(len1: usize, len2: usize) -> bool {
- 2 * (len1 + len2) < len2 * log2_fast(len1)
+ let tot_len = len1 + len2;
+ if tot_len <= 2048 {
+ 2 * tot_len < len2 * log2_fast(len1)
+ } else {
+ 2 * tot_len < len2 * 11
+ }
}
if better_to_rebuild(self.len(), other.len()) {