mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-28 21:32:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Save a few allocations when pushing to a SumTree

Browse source
This commit is contained in:
Antonio Scandurra 2021-05-17 10:33:56 +02:00
parent 781aa92f26
commit 84e0efe5df
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
zed/src/sum_tree/mod.rs
View file

@ -207,27 +207,23 @@ impl<T: Item> SumTree<T> {
pub fn push(&mut self, item: T, ctx: &<T::Summary as Summary>::Context) { pub fn push(&mut self, item: T, ctx: &<T::Summary as Summary>::Context) {
let summary = item.summary(); let summary = item.summary();
self.push_tree( self.push_tree(
SumTree::from_child_trees( SumTree(Arc::new(Node::Leaf {
vec![SumTree(Arc::new(Node::Leaf { summary: summary.clone(),
summary: summary.clone(), items: ArrayVec::from_iter(Some(item)),
items: ArrayVec::from_iter(Some(item)), item_summaries: ArrayVec::from_iter(Some(summary)),
item_summaries: ArrayVec::from_iter(Some(summary)), })),
}))],
ctx,
),
ctx, ctx,
) );
} }
pub fn push_tree(&mut self, other: Self, ctx: &<T::Summary as Summary>::Context) { pub fn push_tree(&mut self, other: Self, ctx: &<T::Summary as Summary>::Context) {
let other_node = other.0.clone(); if !other.0.is_leaf() || other.0.items().len() > 0 {
if !other_node.is_leaf() || other_node.items().len() > 0 { if self.0.height() < other.0.height() {
if self.0.height() < other_node.height() { for tree in other.0.child_trees() {
for tree in other_node.child_trees() {
self.push_tree(tree.clone(), ctx); self.push_tree(tree.clone(), ctx);
} }
} else if let Some(split_tree) = self.push_tree_recursive(other, ctx) { } else if let Some(split_tree) = self.push_tree_recursive(other, ctx) {
*self = Self::from_child_trees(vec![self.clone(), split_tree], ctx); *self = Self::from_child_trees(self.clone(), split_tree, ctx);
} }
} }
} }
@ -353,20 +349,22 @@ impl<T: Item> SumTree<T> {
} }
fn from_child_trees( fn from_child_trees(
child_trees: Vec<SumTree<T>>, left: SumTree<T>,
right: SumTree<T>,
ctx: &<T::Summary as Summary>::Context, ctx: &<T::Summary as Summary>::Context,
) -> Self { ) -> Self {
let height = child_trees[0].0.height() + 1; let height = left.0.height() + 1;
let mut child_summaries = ArrayVec::new(); let mut child_summaries = ArrayVec::new();
for child in &child_trees { child_summaries.push(left.0.summary().clone());
child_summaries.push(child.0.summary().clone()); child_summaries.push(right.0.summary().clone());
} let mut child_trees = ArrayVec::new();
let summary = sum(child_summaries.iter(), ctx); child_trees.push(left);
child_trees.push(right);
SumTree(Arc::new(Node::Internal { SumTree(Arc::new(Node::Internal {
height, height,
summary, summary: sum(child_summaries.iter(), ctx),
child_summaries, child_summaries,
child_trees: ArrayVec::from_iter(child_trees), child_trees,
})) }))
} }