Commit 2f7873f8 authored by Tobias Koppers's avatar Tobias Koppers

use boxes to avoid moving data a lot

parent 0848e314
use std::{cmp::Ordering, collections::BinaryHeap}; use std::{cmp::Ordering, collections::BinaryHeap, mem::replace};
use anyhow::Result; use anyhow::Result;
...@@ -40,7 +40,7 @@ impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> Ord for ActiveIterator<'l, ...@@ -40,7 +40,7 @@ impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> Ord for ActiveIterator<'l,
/// An iterator that merges multiple sorted iterators into a single sorted iterator. Internal it /// An iterator that merges multiple sorted iterators into a single sorted iterator. Internal it
/// uses an heap of iterators to iterate them in order. /// uses an heap of iterators to iterate them in order.
pub struct MergeIter<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> { pub struct MergeIter<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> {
heap: BinaryHeap<ActiveIterator<'l, T>>, heap: BinaryHeap<Box<ActiveIterator<'l, T>>>,
} }
impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> MergeIter<'l, T> { impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> MergeIter<'l, T> {
...@@ -49,7 +49,7 @@ impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> MergeIter<'l, T> { ...@@ -49,7 +49,7 @@ impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> MergeIter<'l, T> {
for (order, mut iter) in iters.enumerate() { for (order, mut iter) in iters.enumerate() {
if let Some(entry) = iter.next() { if let Some(entry) = iter.next() {
let entry = entry?; let entry = entry?;
heap.push(ActiveIterator { iter, order, entry }); heap.push(Box::new(ActiveIterator { iter, order, entry }));
} }
} }
Ok(Self { heap }) Ok(Self { heap })
...@@ -60,20 +60,16 @@ impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> Iterator for MergeIter<'l, ...@@ -60,20 +60,16 @@ impl<'l, T: Iterator<Item = Result<LookupEntry<'l>>>> Iterator for MergeIter<'l,
type Item = Result<LookupEntry<'l>>; type Item = Result<LookupEntry<'l>>;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
let ActiveIterator { let mut active_iter = self.heap.pop()?;
mut iter, let entry = match active_iter.iter.next() {
order, None => active_iter.entry,
entry,
} = self.heap.pop()?;
match iter.next() {
None => {}
Some(Err(e)) => return Some(Err(e)), Some(Err(e)) => return Some(Err(e)),
Some(Ok(next)) => self.heap.push(ActiveIterator { Some(Ok(next)) => {
iter, let entry = replace(&mut active_iter.entry, next);
order, self.heap.push(active_iter);
entry: next, entry
}), }
} };
Some(Ok(entry)) Some(Ok(entry))
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment