diff --git a/crates/onestore/src/section.rs b/crates/onestore/src/section.rs index c90684622767dcfec1b0e5bdd9c55ff21d023d10..919e78c29ea5844aa2575b46952490430ebfba78 100644 --- a/crates/onestore/src/section.rs +++ b/crates/onestore/src/section.rs @@ -1626,15 +1626,24 @@ mod tests { } #[test] - fn a_seal_refuses_a_root_it_did_not_add() { + fn a_seal_refuses_a_root_naming_another_object() { + thread_local! { + static OTHER: std::cell::Cell = const { std::cell::Cell::new(ExGuid { + guid: [0; 16], + n: 0, + }) }; + } + // The new metadata root declared as the page's content root, an object it holds. fn root(transaction: &mut Transaction) { let header = 0x8000705a_u32.to_le_bytes(); - let at = transaction + let at = 4 + transaction .append .windows(4) .position(|w| w == header) .unwrap(); - transaction.append[at + 4] ^= 1; + let mut other = Vec::new(); + OTHER.get().encode(&mut other); + transaction.append[at..at + 20].copy_from_slice(&other); } let source = crate::create_section("root.one", "Original", "Author").unwrap(); let space = page_spaces(&source)[0]; @@ -1642,6 +1651,7 @@ mod tests { let arena = Arena::default(); let mut section = Section::open(&arena, source.clone()).unwrap(); section.attribute(space, "Author", Vec::new()).unwrap(); + OTHER.set(section.active(space).unwrap().live.revision.roots[&1]); TAMPER.set(tamper); let sealed = section.seal(); TAMPER.set(None); diff --git a/crates/onestore/src/write.rs b/crates/onestore/src/write.rs index 7c813efe3ff6085659615658757c9c7e123bbb3b..b4eee77e940aecefcf0c2845f65bf6b283e5a4ba 100644 --- a/crates/onestore/src/write.rs +++ b/crates/onestore/src/write.rs @@ -1034,6 +1034,7 @@ impl<'a> LiveRevision<'a> { .filter(|(role, id)| self.revision.roots.get(role) != Some(id)) .map(|(role, id)| (*role, *id)) .collect(); + let before: BTreeSet = self.revision.roots.values().copied().collect(); self.revision.roots = roots; let mut changed = BTreeSet::new(); // Whether each object whose count may move was reachable before. @@ -1060,10 +1061,17 @@ impl<'a> LiveRevision<'a> { message: "Object is the root of multiple roles", }); } + // Being a root counts as one reference, which a moved or dropped root gives up. + removed.extend( + before + .iter() + .filter(|id| !roots.contains(id) && self.incoming.contains_key(id)) + .copied(), + ); added.extend( roots .into_iter() - .filter(|id| !self.incoming.contains_key(id)), + .filter(|id| !self.incoming.contains_key(id) || !before.contains(id)), ); // Attaching before detaching keeps a moved subtree from being walked twice. while let Some(id) = added.pop() { diff --git a/crates/onestore/src/write/tests.rs b/crates/onestore/src/write/tests.rs index d7eac303fab09f140e09abe557166742c6cf1901..f2f28239e6d6e3ca791a804125a4789c9e41eecb 100644 --- a/crates/onestore/src/write/tests.rs +++ b/crates/onestore/src/write/tests.rs @@ -970,3 +970,38 @@ fn character_formatting_preserves_inheritance_and_associated_data() { } } } + +#[test] +fn moving_or_dropping_a_root_keeps_reference_counts() { + use super::LiveRevision; + use crate::{RevisionIndex, Store}; + use std::collections::BTreeMap; + let source = crate::create_section("roots.one", "Original", "Author").unwrap(); + let store = Store::parse(&source).unwrap(); + let index = RevisionIndex::parse(&store).unwrap(); + let revision = index + .spaces + .keys() + .filter_map(|space| index.resolve_active(*space).ok()) + .find(|revision| revision.roots.len() == 2) + .unwrap(); + let (first, second) = (revision.roots[&1], revision.roots[&2]); + let other = *revision.objects[&first] + .references() + .unwrap() + .objects + .first() + .unwrap(); + assert_ne!(other, second); + let mut live = LiveRevision::new(revision, 1).unwrap(); + let moved = BTreeMap::from([(1, first), (2, other)]); + let commit = live.commit_as(Vec::new(), moved).unwrap(); + assert!(!commit.checkpoint); + assert_eq!(commit.roots, BTreeMap::from([(2, other)])); + assert_eq!(live.incoming, live.revision.reference_counts().unwrap()); + let commit = live + .commit_as(Vec::new(), BTreeMap::from([(1, first)])) + .unwrap(); + assert!(commit.checkpoint); + assert_eq!(live.incoming, live.revision.reference_counts().unwrap()); +}