mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-05 20:55:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

index: cache generation numbers during common_ancestors_pos() computation

Browse source 
I'm not sure if this is better, but common_ancestors_pos() would have a
similar property to heads_pos().
This commit is contained in:
Yuya Nishihara 2023-11-15 13:05:21 +09:00
parent ea4bdd718d
commit d4059520a9
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/src/default_index_store.rs
View file

@ -903,30 +903,32 @@ impl<'a> CompositeIndex<'a> {
) -> BTreeSet<IndexPosition> {
let mut items1: BTreeSet<_> = set1
.iter()
.map(|pos| IndexEntryByGeneration(self.entry_by_pos(*pos)))
.map(|pos| IndexPositionByGeneration::from(&self.entry_by_pos(*pos)))
.collect();
let mut items2: BTreeSet<_> = set2
.iter()
.map(|pos| IndexEntryByGeneration(self.entry_by_pos(*pos)))
.map(|pos| IndexPositionByGeneration::from(&self.entry_by_pos(*pos)))
.collect();
let mut result = BTreeSet::new();
while let (Some(entry1), Some(entry2)) = (items1.last(), items2.last()) {
match entry1.cmp(entry2) {
while let (Some(item1), Some(item2)) = (items1.last(), items2.last()) {
match item1.cmp(item2) {
Ordering::Greater => {
let entry1 = items1.pop_last().unwrap();
for parent_entry in entry1.0.parents() {
items1.insert(IndexEntryByGeneration(parent_entry));
let item1 = items1.pop_last().unwrap();
let entry1 = self.entry_by_pos(item1.pos);
for parent_entry in entry1.parents() {
items1.insert(IndexPositionByGeneration::from(&parent_entry));
}
}
Ordering::Less => {
let entry2 = items2.pop_last().unwrap();
for parent_entry in entry2.0.parents() {
items2.insert(IndexEntryByGeneration(parent_entry));
let item2 = items2.pop_last().unwrap();
let entry2 = self.entry_by_pos(item2.pos);
for parent_entry in entry2.parents() {
items2.insert(IndexPositionByGeneration::from(&parent_entry));
}
}
Ordering::Equal => {
result.insert(entry1.0.pos);
result.insert(item1.pos);
items1.pop_last();
items2.pop_last();
}
@ -1098,24 +1100,6 @@ impl PartialOrd for IndexEntryByPosition<'_> {
}
}
#[derive(Clone, Eq, PartialEq)]
struct IndexEntryByGeneration<'a>(IndexEntry<'a>);
impl Ord for IndexEntryByGeneration<'_> {
fn cmp(&self, other: &Self) -> Ordering {
self.0
.generation_number()
.cmp(&other.0.generation_number())
.then(self.0.pos.cmp(&other.0.pos))
}
}
impl PartialOrd for IndexEntryByGeneration<'_> {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}
/// Wrapper to sort `IndexPosition` by its generation number.
///
/// This is similar to `IndexEntry` newtypes, but optimized for size and cache