Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid calling add_summary twice in sum_tree::Cursor

Browse source 
As I was looking into `SumTree` for the upcoming round of changes to the
buffer, I noticed that we were inadvertently adding summaries twice
every time we skipped over a node in the tree.

This is a pretty heavy code path that's pretty ubiquitous in the
codebase, so this commit gets rid of the unnecessary addition.
This commit is contained in:
Antonio Scandurra 2021-05-31 16:45:57 +02:00
parent 081191917c
commit 32fbdfeab5
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zed/src/sum_tree/cursor.rs
View file

@ -434,7 +434,7 @@ where
if comparison == Ordering::Greater if comparison == Ordering::Greater
|| (comparison == Ordering::Equal && bias == SeekBias::Right) || (comparison == Ordering::Equal && bias == SeekBias::Right)
{ {
self.seek_dimension.add_summary(child_summary); self.seek_dimension = child_end;
self.sum_dimension.add_summary(child_summary); self.sum_dimension.add_summary(child_summary);
match aggregate { match aggregate {
SeekAggregate::None => {} SeekAggregate::None => {}
@ -469,14 +469,14 @@ where
.iter() .iter()
.zip(&item_summaries[entry.index..]) .zip(&item_summaries[entry.index..])
{ {
let mut item_end = self.seek_dimension.clone(); let mut child_end = self.seek_dimension.clone();
item_end.add_summary(item_summary); child_end.add_summary(item_summary);
let comparison = target.cmp(&item_end, cx); let comparison = target.cmp(&child_end, cx);
if comparison == Ordering::Greater if comparison == Ordering::Greater
|| (comparison == Ordering::Equal && bias == SeekBias::Right) || (comparison == Ordering::Equal && bias == SeekBias::Right)
{ {
self.seek_dimension.add_summary(item_summary); self.seek_dimension = child_end;
self.sum_dimension.add_summary(item_summary); self.sum_dimension.add_summary(item_summary);
match aggregate { match aggregate {
SeekAggregate::None => {} SeekAggregate::None => {}
@ -550,7 +550,7 @@ where
if comparison == Ordering::Greater if comparison == Ordering::Greater
|| (comparison == Ordering::Equal && bias == SeekBias::Right) || (comparison == Ordering::Equal && bias == SeekBias::Right)
{ {
self.seek_dimension.add_summary(child_summary); self.seek_dimension = child_end;
self.sum_dimension.add_summary(child_summary); self.sum_dimension.add_summary(child_summary);
match aggregate { match aggregate {
SeekAggregate::None => {} SeekAggregate::None => {}
@ -596,7 +596,7 @@ where
if comparison == Ordering::Greater if comparison == Ordering::Greater
|| (comparison == Ordering::Equal && bias == SeekBias::Right) || (comparison == Ordering::Equal && bias == SeekBias::Right)
{ {
self.seek_dimension.add_summary(item_summary); self.seek_dimension = child_end;
self.sum_dimension.add_summary(item_summary); self.sum_dimension.add_summary(item_summary);
match aggregate { match aggregate {
SeekAggregate::None => {} SeekAggregate::None => {}