mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-05 19:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

index: use BinaryHeap instead of BTreeSet in common_ancestors_pos()

Browse source 
For the same reason as the heads_pos() change. We just want to omit duplicated
items.
This commit is contained in:
Yuya Nishihara 2023-11-15 15:36:01 +09:00
parent d4059520a9
commit 93fbcec2f7
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/src/default_index_store.rs
View file

@ -901,36 +901,38 @@ impl<'a> CompositeIndex<'a> {
set1: &[IndexPosition], set1: &[IndexPosition],
set2: &[IndexPosition], set2: &[IndexPosition],
) -> BTreeSet<IndexPosition> { ) -> BTreeSet<IndexPosition> {
let mut items1: BTreeSet<_> = set1 let mut items1: BinaryHeap<_> = set1
.iter() .iter()
.map(|pos| IndexPositionByGeneration::from(&self.entry_by_pos(*pos))) .map(|pos| IndexPositionByGeneration::from(&self.entry_by_pos(*pos)))
.collect(); .collect();
let mut items2: BTreeSet<_> = set2 let mut items2: BinaryHeap<_> = set2
.iter() .iter()
.map(|pos| IndexPositionByGeneration::from(&self.entry_by_pos(*pos))) .map(|pos| IndexPositionByGeneration::from(&self.entry_by_pos(*pos)))
.collect(); .collect();
let mut result = BTreeSet::new(); let mut result = BTreeSet::new();
while let (Some(item1), Some(item2)) = (items1.last(), items2.last()) { while let (Some(item1), Some(item2)) = (items1.peek(), items2.peek()) {
match item1.cmp(item2) { match item1.cmp(item2) {
Ordering::Greater => { Ordering::Greater => {
let item1 = items1.pop_last().unwrap(); let item1 = dedup_pop(&mut items1).unwrap();
let entry1 = self.entry_by_pos(item1.pos); let entry1 = self.entry_by_pos(item1.pos);
for parent_entry in entry1.parents() { for parent_entry in entry1.parents() {
items1.insert(IndexPositionByGeneration::from(&parent_entry)); assert!(parent_entry.pos < entry1.pos);
items1.push(IndexPositionByGeneration::from(&parent_entry));
} }
} }
Ordering::Less => { Ordering::Less => {
let item2 = items2.pop_last().unwrap(); let item2 = dedup_pop(&mut items2).unwrap();
let entry2 = self.entry_by_pos(item2.pos); let entry2 = self.entry_by_pos(item2.pos);
for parent_entry in entry2.parents() { for parent_entry in entry2.parents() {
items2.insert(IndexPositionByGeneration::from(&parent_entry)); assert!(parent_entry.pos < entry2.pos);
items2.push(IndexPositionByGeneration::from(&parent_entry));
} }
} }
Ordering::Equal => { Ordering::Equal => {
result.insert(item1.pos); result.insert(item1.pos);
items1.pop_last(); dedup_pop(&mut items1).unwrap();
items2.pop_last(); dedup_pop(&mut items2).unwrap();
} }
} }
} }