diff options
Diffstat (limited to 'src/federation')
| -rw-r--r-- | src/federation/store/memory.rs | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/src/federation/store/memory.rs b/src/federation/store/memory.rs index 05479e3..b4be6f0 100644 --- a/src/federation/store/memory.rs +++ b/src/federation/store/memory.rs @@ -359,6 +359,41 @@ impl<F: Fold> Store<F> { .collect() } + /// Of the events taken after the checkpoint, those a move to a checkpoint at `heads` + /// refuses: neither among them, nor in their history, nor above them (`moved`), where + /// they are heads a version may name. + pub(crate) fn beside(&self, heads: &[Id]) -> Vec<Id> { + let set: BTreeSet<Id> = heads.iter().copied().collect(); + let before = self.history(heads); + let above = self.above(&set, &before); + self.order + .iter() + .filter(|id| !before.contains(id) && !above.contains(id)) + .copied() + .collect() + } + + /// Of the events taken after the checkpoint, those above `heads`, `before` being their + /// history: each building on the heads, or on what is above them, alone, and on all + /// the heads or on one above them. + fn above(&self, heads: &BTreeSet<Id>, before: &HashSet<Id>) -> HashSet<Id> { + let mut above: HashSet<Id> = HashSet::new(); + for id in self.order.iter().filter(|id| !before.contains(id)) { + let dependencies = &self.events[id].dependencies; + let on = dependencies + .iter() + .all(|dependency| heads.contains(dependency) || above.contains(dependency)); + let holds = dependencies + .iter() + .any(|dependency| above.contains(dependency)) + || heads.iter().all(|head| dependencies.contains(head)); + if on && holds { + above.insert(*id); + } + } + above + } + /// The events taken after the checkpoint among `ids` and all they build on. fn history(&self, ids: &[Id]) -> HashSet<Id> { let mut history = HashSet::new(); @@ -422,20 +457,7 @@ impl<F: Fold> Store<F> { return false; }; let before = self.history(&ids); - let mut above: HashSet<Id> = HashSet::new(); - for id in self.order.iter().filter(|id| !before.contains(id)) { - let dependencies = &self.events[id].dependencies; - let on = dependencies - .iter() - .all(|dependency| heads.contains(dependency) || above.contains(dependency)); - let holds = dependencies - .iter() - .any(|dependency| above.contains(dependency)) - || heads.iter().all(|head| dependencies.contains(head)); - if on && holds { - above.insert(*id); - } - } + let above = self.above(&heads, &before); for id in &self.order { if before.contains(id) { if !kept.contains_key(id) && !heads.contains(id) { @@ -1184,6 +1206,10 @@ mod tests { store.left_out(&[head, beside], &[first, beside, above]), vec![above] ); + // What a move there refuses: what is beside them, and what builds on it too. + let both = taken(store.offer(testfold::put(&[above, beside], "d", "1"))); + assert_eq!(store.beside(&[head]), vec![beside, both]); + assert_eq!(store.beside(&[head, beside]), vec![above, both]); } /// A store whose root holds puts and a lock, cut at the lock: the cut's ID, the lock's, |
