OXYGENHUB

Coverage / crates/oxy-core/src/tree.rs 93.7%

1153 of 1231 lines run, 161 of 183 functions · run #254 on main · run missed

1
//! The tree graph: nodes, placements, and modes as atoms (spec §7.1, §7.2),
2
//! with tree conflict detection and path assignment (spec §9.2).
3
4
use crate::hash::ChangeHash;
5
use crate::ids::NodeId;
6
use crate::objects::{Mode, NodeKind, OpRef, TreeOp};
7
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
8
9
/// `(change, index into that change's tree_ops)`.
10
pub type OpKey = (ChangeHash, u32);
11
12
/// The graph's own maps: keyed by hashes and random ids, which need no
13
/// SipHash (see [`crate::fasthash`]).
14
type Map<K, V> = crate::fasthash::FastMap<K, V>;
15
16
/// A node's placement or mode atoms, sorted: nearly always one, held
17
/// without an allocation.
18
#[derive(Clone, Debug, Default, PartialEq, Eq)]
19
enum KeySet {
20
    #[default]
21
    Empty,
22
    One(OpKey),
23
    Many(Vec<OpKey>),
24
}
25
26
impl KeySet {
27275204×
    fn insert(&mut self, k: OpKey) {
28158×
        match self {
29275012×
            KeySet::Empty => *self = KeySet::One(k),
30158×
            KeySet::One(a) if *a == k => {}
31158×
            KeySet::One(a) => {
32158×
                let a = *a;
33158×
                *self = KeySet::Many(if a < k { vec![a, k] } else { vec![k, a] });
34
            }
3534×
            KeySet::Many(v) => {
3634×
                if let Err(i) = v.binary_search(&k) {
3734×
                    v.insert(i, k);
3834×
                }
39
            }
40
        }
41275204×
    }
42471×
    fn remove(&mut self, k: &OpKey) {
43465×
        match self {
44465×
            KeySet::One(a) if a == k => *self = KeySet::Empty,
456×
            KeySet::Many(v) => {
466×
                if let Ok(i) = v.binary_search(k) {
476×
                    v.remove(i);
486×
                }
496×
                if v.len() == 1 {
506×
                    *self = KeySet::One(v[0]);
516×
                } else if v.is_empty() {
520×
                    *self = KeySet::Empty;
530×
                }
54
            }
5592×
            _ => {}
56
        }
57471×
    }
5820302887×
    fn as_slice(&self) -> &[OpKey] {
5920302887×
        match self {
600×
            KeySet::Empty => &[],
6120302852×
            KeySet::One(a) => std::slice::from_ref(a),
6235×
            KeySet::Many(v) => v,
63
        }
6420302887×
    }
6520291258×
    fn iter(&self) -> std::slice::Iter<'_, OpKey> {
6620291258×
        self.as_slice().iter()
6720291258×
    }
6811629×
    fn len(&self) -> usize {
6911629×
        self.as_slice().len()
7011629×
    }
71471×
    fn is_empty(&self) -> bool {
72471×
        matches!(self, KeySet::Empty)
73471×
    }
74
}
75
76
impl<'a> IntoIterator for &'a KeySet {
77
    type Item = &'a OpKey;
78
    type IntoIter = std::slice::Iter<'a, OpKey>;
796763083×
    fn into_iter(self) -> Self::IntoIter {
806763083×
        self.iter()
816763083×
    }
82
}
83
84
#[derive(Clone, Debug, PartialEq, Eq)]
85
pub struct Placement {
86
    pub node: NodeId,
87
    pub parent: NodeId,
88
    pub name: String,
89
}
90
91
#[derive(Clone, Debug, Default)]
92
struct TreeMaps {
93
    kinds: Map<NodeId, NodeKind>,
94
    introduced: Map<NodeId, ChangeHash>,
95
    placements: Map<OpKey, Placement>,
96
    modes: Map<OpKey, (NodeId, Mode)>,
97
    /// Placement atoms retired by `RemoveNode`/`Move`, and mode atoms retired
98
    /// by `SetMode`. Kept apart because `AddNode` introduces one of each
99
    /// under the same key.
100
    deleted_placements: Map<OpKey, BTreeSet<ChangeHash>>,
101
    deleted_modes: Map<OpKey, BTreeSet<ChangeHash>>,
102
    placements_of: Map<NodeId, KeySet>,
103
    modes_of: Map<NodeId, KeySet>,
104
    /// The live subsets of `placements_of` and `modes_of`, kept as changes
105
    /// apply, so the view walks what is live rather than all history.
106
    live_placements_of: Map<NodeId, KeySet>,
107
    live_modes_of: Map<NodeId, KeySet>,
108
}
109
110
#[derive(Clone, Debug, Default)]
111
pub struct TreeGraph {
112
    /// The graph itself; see [`TreeGraph::m`].
113
    maps: std::sync::OnceLock<TreeMaps>,
114
    /// A state index's encoding of `maps`, decoded when first needed: a
115
    /// command that only reads the view (a status) never needs them.
116
    raw: Option<std::sync::Arc<Vec<u8>>>,
117
    /// The introducers block of the same index, read alone while `maps`
118
    /// is not decoded: a snapshot asks for introducers but no more.
119
    raw_introduced: Option<std::sync::Arc<Vec<u8>>>,
120
    introduced_only: std::sync::OnceLock<Map<NodeId, ChangeHash>>,
121
    /// The view, once computed, with the path of each directory in it;
122
    /// kept up to date as ops apply when that is simple (see
123
    /// `update_view`), cleared otherwise.
124
    view_cache: std::sync::OnceLock<CachedView>,
125
}
126
127
#[derive(Clone, Debug, PartialEq, Eq)]
128
pub enum TreeConflict {
129
    /// Two live nodes share `(parent, name)`.
130
    Name {
131
        parent: NodeId,
132
        name: String,
133
        nodes: Vec<NodeId>,
134
    },
135
    /// One node has several live placements.
136
    MultiPlacement {
137
        node: NodeId,
138
        placements: Vec<OpKey>,
139
    },
140
    /// A live node's parent is not live.
141
    Orphan { node: NodeId, parent: NodeId },
142
    /// A directory is placed inside its own descendant.
143
    Cycle { node: NodeId },
144
    /// Several live mode atoms.
145
    Mode { node: NodeId, modes: Vec<Mode> },
146
}
147
148
/// A node as it appears in the working copy.
149
#[derive(Clone, Debug, PartialEq, Eq)]
150
pub struct TreeEntry {
151
    pub path: String,
152
    pub node: NodeId,
153
    pub kind: NodeKind,
154
    pub mode: Mode,
155
    /// The placement this entry materializes (for building `RemoveNode`/`Move`).
156
    pub placement: OpKey,
157
    /// The live mode atom (for building `SetMode`).
158
    pub mode_atom: Option<OpKey>,
159
}
160
161
#[derive(Clone, Debug, Default)]
162
struct CachedView {
163
    view: TreeView,
164
    dirs: HashMap<NodeId, String>,
165
}
166
167
impl CachedView {
1683552×
    fn new(view: TreeView) -> CachedView {
1693552×
        let mut dirs: HashMap<NodeId, String> = view
1703552×
            .entries
1713552×
            .values()
17238440×
            .filter(|e| e.kind == NodeKind::Dir)
1733552×
            .map(|e| (e.node, e.path.clone()))
1743552×
            .collect();
1753552×
        dirs.insert(NodeId::ROOT, String::new());
1763552×
        CachedView { view, dirs }
1773552×
    }
178
}
179
180
#[derive(Clone, Debug, Default, PartialEq, Eq)]
181
pub struct TreeView {
182
    /// Path → entry, paths use `/` and have no leading slash; conflicted
183
    /// entries carry a `.oxy-conflict-<n>` suffix. Shared, so a view is
184
    /// cheap to clone.
185
    pub entries: std::sync::Arc<BTreeMap<String, TreeEntry>>,
186
    pub conflicts: Vec<TreeConflict>,
187
}
188
189
impl TreeView {
1902254×
    pub fn is_conflicted(&self) -> bool {
1912254×
        !self.conflicts.is_empty()
1922254×
    }
1931226×
    pub fn by_node(&self) -> HashMap<NodeId, &TreeEntry> {
1949445×
        self.entries.values().map(|e| (e.node, e)).collect()
1951226×
    }
196
}
197
198
impl TreeGraph {
1992521×
    pub fn new() -> Self {
2002521×
        Self::default()
2012521×
    }
202
203
    /// The graph's maps, decoded from a state index on first use.
20448299506×
    fn m(&self) -> &TreeMaps {
20548299506×
        self.maps.get_or_init(|| match &self.raw {
2062513×
            Some(raw) => {
2072513×
                TreeMaps::decode(raw).expect("a state index is checked against its hash when read")
208
            }
2094608×
            None => TreeMaps::default(),
2107121×
        })
21148299506×
    }
212
213697927×
    fn m_mut(&mut self) -> &mut TreeMaps {
214697927×
        self.m();
215697927×
        self.maps.get_mut().expect("decoded just now")
216697927×
    }
217
218
    /// Apply tree op `index` of `change`; `OpRef` self references must already be resolved.
21936948×
    pub fn apply(&mut self, change: ChangeHash, index: u32, op: &TreeOp) {
22036948×
        let cached = self.view_cache.take();
221
        // Whether the placement or mode atom this op retires was live.
22236948×
        let was_live = match op {
223519×
            TreeOp::RemoveNode { placement, .. } => self.placement_live(&op_key(*placement)),
224144×
            TreeOp::Move { old, .. } => self.placement_live(&op_key(*old)),
22528×
            TreeOp::SetMode { old, .. } => self.mode_live(&op_key(*old)),
22636257×
            TreeOp::AddNode { .. } => false,
227
        };
22836948×
        self.apply_to_graph(change, index, op);
22936948×
        if let Some(mut c) = cached {
23011789×
            if self.update_view(&mut c, (change, index), op, was_live) {
2312522×
                #[cfg(test)]
2329098×
                assert_eq!(
2332522×
                    c.view,
2349098×
                    self.compute_view(),
2352522×
                    "view kept up to date by {op:?}"
2362522×
                );
23711620×
                self.view_cache = std::sync::OnceLock::from(c);
2382522×
            }
23925159×
        }
24036948×
    }
241
24236948×
    fn apply_to_graph(&mut self, change: ChangeHash, index: u32, op: &TreeOp) {
24336948×
        let key = (change, index);
24436948×
        match op {
245
            TreeOp::AddNode {
24636257×
                node,
24736257×
                kind,
24836257×
                mode,
24936257×
                parent,
25036257×
                name,
251
            } => {
25236257×
                self.m_mut().kinds.insert(*node, *kind);
25336257×
                self.m_mut().introduced.insert(*node, change);
25436257×
                self.m_mut().placements.insert(
25536257×
                    key,
25636257×
                    Placement {
25736257×
                        node: *node,
25836257×
                        parent: *parent,
25936257×
                        name: name.clone(),
26036257×
                    },
261
                );
26236257×
                self.m_mut()
26336257×
                    .placements_of
26436257×
                    .entry(*node)
26536257×
                    .or_default()
26636257×
                    .insert(key);
26736257×
                self.index_placement(key);
26836257×
                if *kind != NodeKind::Dir {
26934576×
                    self.m_mut().modes.insert(key, (*node, *mode));
27034576×
                    self.m_mut().modes_of.entry(*node).or_default().insert(key);
27134576×
                    self.index_mode(key);
27234576×
                }
273
            }
274519×
            TreeOp::RemoveNode { placement, .. } => {
275519×
                self.m_mut()
276519×
                    .deleted_placements
277519×
                    .entry(op_key(*placement))
278519×
                    .or_default()
279519×
                    .insert(change);
280519×
                self.index_placement(op_key(*placement));
281519×
            }
282
            TreeOp::Move {
283144×
                node,
284144×
                old,
285144×
                parent,
286144×
                name,
287144×
            } => {
288144×
                self.m_mut()
289144×
                    .deleted_placements
290144×
                    .entry(op_key(*old))
291144×
                    .or_default()
292144×
                    .insert(change);
293144×
                self.index_placement(op_key(*old));
294144×
                self.m_mut().placements.insert(
295144×
                    key,
296144×
                    Placement {
297144×
                        node: *node,
298144×
                        parent: *parent,
299144×
                        name: name.clone(),
300144×
                    },
301144×
                );
302144×
                self.m_mut()
303144×
                    .placements_of
304144×
                    .entry(*node)
305144×
                    .or_default()
306144×
                    .insert(key);
307144×
                self.index_placement(key);
308144×
            }
30928×
            TreeOp::SetMode { node, old, mode } => {
31028×
                self.m_mut()
31128×
                    .deleted_modes
31228×
                    .entry(op_key(*old))
31328×
                    .or_default()
31428×
                    .insert(change);
31528×
                self.index_mode(op_key(*old));
31628×
                self.m_mut().modes.insert(key, (*node, *mode));
31728×
                self.m_mut().modes_of.entry(*node).or_default().insert(key);
31828×
                self.index_mode(key);
31928×
            }
320
        }
32136948×
    }
322
323
    /// Bring the cached view `c` up to date with `op` (already applied as
324
    /// `key`) where that is simple and the view has no conflicts; false
325
    /// when it must be computed again. `was_live`: whether the placement or
326
    /// mode atom `op` retires was live before it.
32711789×
    fn update_view(&self, c: &mut CachedView, key: OpKey, op: &TreeOp, was_live: bool) -> bool {
32811789×
        if !c.view.conflicts.is_empty() {
3299×
            return false;
33011780×
        }
33111780×
        match op {
33211619×
            TreeOp::AddNode { node, .. } => self.view_add(c, *node, key),
33398×
            TreeOp::RemoveNode { node, placement } => {
33498×
                !was_live || self.view_remove(c, *node, op_key(*placement))
335
            }
33654×
            TreeOp::Move { node, old, .. } => {
33754×
                (!was_live || self.view_remove(c, *node, op_key(*old)))
33810×
                    && self.view_add(c, *node, key)
339
            }
3409×
            TreeOp::SetMode { node, .. } => {
3419×
                let live = self.live_placements(node);
3429×
                match live.as_slice() {
3439×
                    [] => true,
3445×
                    [(k, p)] => {
3455×
                        let Some(path) = c.dirs.get(&p.parent).map(|d| join(d, &p.name)) else {
3460×
                            return false;
347
                        };
3485×
                        let Some(mode) = self.entry_mode(node) else {
3490×
                            return false;
350
                        };
3515×
                        let entries = std::sync::Arc::make_mut(&mut c.view.entries);
3525×
                        match entries.get_mut(&path) {
3535×
                            Some(e) if e.node == *node && e.placement == *k => {
3545×
                                (e.mode_atom, e.mode) = mode;
3555×
                                true
356
                            }
3570×
                            _ => false,
358
                        }
359
                    }
3600×
                    _ => false,
361
                }
362
            }
363
        }
36411789×
    }
365
366
    /// The view entry for `node`'s placement `key`, just made live.
36711629×
    fn view_add(&self, c: &mut CachedView, node: NodeId, key: OpKey) -> bool {
36811629×
        if !self.placement_live(&key) {
3690×
            return true;
37011629×
        }
37111629×
        if self
37211629×
            .m()
37311629×
            .live_placements_of
37411629×
            .get(&node)
37511629×
            .is_none_or(|s| s.len() != 1)
376
        {
3776×
            return false;
37811623×
        }
37911623×
        let Some(p) = self.m().placements.get(&key) else {
3800×
            return false;
381
        };
38211623×
        let Some(path) = c.dirs.get(&p.parent).map(|d| join(d, &p.name)) else {
3832×
            return false;
384
        };
38511621×
        let Some((mode_atom, mode)) = self.entry_mode(&node) else {
3860×
            return false;
387
        };
38811621×
        let kind = self.kind(&node).unwrap_or(NodeKind::File);
38911621×
        let entries = std::sync::Arc::make_mut(&mut c.view.entries);
39011621×
        if entries.contains_key(&path) || node == NodeId::ROOT {
39150×
            return false;
39211571×
        }
393
        // Nothing can be placed under a directory that was not in the view
394
        // yet: it would have been an orphan, and the view had no conflicts.
39511571×
        if kind == NodeKind::Dir {
396763×
            c.dirs.insert(node, path.clone());
39710808×
        }
39811571×
        entries.insert(
39911571×
            path.clone(),
40011571×
            TreeEntry {
40111571×
                path,
40211571×
                node,
40311571×
                kind,
40411571×
                mode,
40511571×
                placement: key,
40611571×
                mode_atom,
40711571×
            },
408
        );
40911571×
        true
41011629×
    }
411
412
    /// Drop the view entry of `node`'s placement `key`, just retired.
413142×
    fn view_remove(&self, c: &mut CachedView, node: NodeId, key: OpKey) -> bool {
414142×
        if self.m().live_placements_of.contains_key(&node) {
41544×
            return false;
41698×
        }
41798×
        let Some(p) = self.m().placements.get(&key) else {
41846×
            return false;
419
        };
42052×
        let Some(path) = c.dirs.get(&p.parent).map(|d| join(d, &p.name)) else {
4210×
            return false;
422
        };
42352×
        let entries = std::sync::Arc::make_mut(&mut c.view.entries);
42452×
        match entries.get(&path) {
42552×
            Some(e) if e.node == node && e.placement == key => {}
4260×
            _ => return false,
427
        }
42852×
        if entries.get(&path).is_some_and(|e| e.kind == NodeKind::Dir) {
42913×
            let prefix = format!("{path}/");
43013×
            if entries
43113×
                .range(prefix.clone()..)
43213×
                .next()
43313×
                .is_some_and(|(k, _)| k.starts_with(&prefix))
434
            {
43512×
                return false;
4361×
            }
4371×
            c.dirs.remove(&node);
43839×
        }
43940×
        entries.remove(&path);
44040×
        true
441142×
    }
442
443
    /// The mode atom and mode of `node`'s entry, as `compute_view` finds
444
    /// them; `None` when its live modes conflict.
44511626×
    fn entry_mode(&self, node: &NodeId) -> Option<(Option<OpKey>, Mode)> {
44611626×
        let lm = self.live_modes(node);
44711626×
        let distinct: BTreeSet<Mode> = lm.iter().map(|(_, m)| *m).collect();
44811626×
        if distinct.len() > 1 {
4490×
            return None;
45011626×
        }
45111626×
        let mode_atom = lm.iter().map(|(k, _)| *k).max();
45211626×
        let mode = mode_atom
45311626×
            .and_then(|k| self.m().modes.get(&k).map(|(_, m)| *m))
45411626×
            .unwrap_or_default();
45511626×
        Some((mode_atom, mode))
45611626×
    }
457
458
    /// Bring placement `k` in the live index up to date.
45970475×
    fn index_placement(&mut self, k: OpKey) {
46070475×
        let Some(node) = self.m_mut().placements.get(&k).map(|p| p.node) else {
461254×
            return;
462
        };
46370221×
        if self.placement_live(&k) {
46469534×
            self.m_mut()
46569534×
                .live_placements_of
46669534×
                .entry(node)
46769534×
                .or_default()
46869534×
                .insert(k);
46969534×
        } else if let Some(set) = self.m_mut().live_placements_of.get_mut(&node) {
470443×
            set.remove(&k);
471443×
            if set.is_empty() {
472363×
                self.m_mut().live_placements_of.remove(&node);
473363×
            }
474244×
        }
47570475×
    }
476
477
    /// Bring mode atom `k` in the live index up to date.
47867965×
    fn index_mode(&mut self, k: OpKey) {
47967965×
        let Some(node) = self.m_mut().modes.get(&k).map(|(n, _)| *n) else {
48015×
            return;
481
        };
48267950×
        if self.mode_live(&k) {
48367921×
            self.m_mut()
48467921×
                .live_modes_of
48567921×
                .entry(node)
48667921×
                .or_default()
48767921×
                .insert(k);
48867921×
        } else if let Some(set) = self.m_mut().live_modes_of.get_mut(&node) {
48928×
            set.remove(&k);
49028×
            if set.is_empty() {
49110×
                self.m_mut().live_modes_of.remove(&node);
49218×
            }
4931×
        }
49467965×
    }
495
496
    /// Directories no longer placed anywhere, by the (parent, name) they
497
    /// were last placed at, with that placement: what an import can bring
498
    /// back rather than make a second node for one Git path.
49912×
    pub fn dead_dirs(&self) -> HashMap<(NodeId, String), (NodeId, OpKey)> {
50012×
        let mut out: HashMap<(NodeId, String), (NodeId, OpKey)> = HashMap::new();
50112×
        for (k, p) in &self.m().placements {
50212×
            if self.kind(&p.node) != Some(NodeKind::Dir)
5034×
                || self.placement_live(k)
5042×
                || !self.live_placements(&p.node).is_empty()
505
            {
50610×
                continue;
5072×
            }
5082×
            let slot = out
5092×
                .entry((p.parent, p.name.clone()))
5102×
                .or_insert((p.node, *k));
511
            // The newest placement, by key: the same answer in any order.
5122×
            if *k > slot.1 {
5130×
                *slot = (p.node, *k);
5142×
            }
515
        }
51612×
        out
51712×
    }
518
519
    /// Every placement `node` ever had, live or not, with the changes that
520
    /// retired it (none while live).
5210×
    pub fn placement_history(&self, node: &NodeId) -> Vec<(OpKey, &Placement, Vec<ChangeHash>)> {
5220×
        self.m()
5230×
            .placements_of
5240×
            .get(node)
5250×
            .into_iter()
5260×
            .flatten()
5270×
            .filter_map(|k| {
5280×
                let p = self.m().placements.get(k)?;
5290×
                let by = self
5300×
                    .m()
5310×
                    .deleted_placements
5320×
                    .get(k)
5330×
                    .map(|d| d.iter().copied().collect())
5340×
                    .unwrap_or_default();
5350×
                Some((*k, p, by))
5360×
            })
5370×
            .collect()
5380×
    }
539
54082517×
    fn placement_live(&self, k: &OpKey) -> bool {
54182517×
        self.m()
54282517×
            .deleted_placements
54382517×
            .get(k)
54482517×
            .is_none_or(|d| d.is_empty())
54582517×
    }
54667978×
    fn mode_live(&self, k: &OpKey) -> bool {
54767978×
        self.m().deleted_modes.get(k).is_none_or(|d| d.is_empty())
54867978×
    }
549
5506774723×
    pub fn kind(&self, node: &NodeId) -> Option<NodeKind> {
5516774723×
        if node.is_root() {
5520×
            Some(NodeKind::Dir)
553
        } else {
5546774723×
            self.m().kinds.get(node).copied()
555
        }
5566774723×
    }
557
558
    /// The change whose `AddNode` introduced `node`.
55914347×
    pub fn introducer(&self, node: &NodeId) -> Option<ChangeHash> {
56014347×
        if let (None, Some(raw)) = (self.maps.get(), &self.raw_introduced) {
561546×
            let only = self.introduced_only.get_or_init(|| {
56258×
                read_introduced(raw).expect("a state index is checked against its hash when read")
56358×
            });
564
            #[cfg(test)]
5650×
            assert_eq!(
5660×
                only.get(node),
5670×
                TreeMaps::decode(self.raw.as_ref().unwrap())
5680×
                    .unwrap()
5690×
                    .introduced
5700×
                    .get(node),
571
                "the introducers block is the maps'"
572
            );
573546×
            return only.get(node).copied();
57413801×
        }
57513801×
        self.m().introduced.get(node).copied()
57614347×
    }
577
5780×
    pub fn placement(&self, k: &OpKey) -> Option<&Placement> {
5790×
        self.m().placements.get(k)
5800×
    }
581
5826763126×
    pub fn live_placements(&self, node: &NodeId) -> Vec<(OpKey, &Placement)> {
5836763126×
        self.m()
5846763126×
            .live_placements_of
5856763126×
            .get(node)
5866763126×
            .into_iter()
5876763126×
            .flat_map(|ks| ks.iter())
5886763129×
            .filter_map(|k| self.m().placements.get(k).map(|p| (*k, p)))
5896763126×
            .collect()
5906763126×
    }
591
5926774709×
    pub fn live_modes(&self, node: &NodeId) -> Vec<(OpKey, Mode)> {
5936774709×
        self.m()
5946774709×
            .live_modes_of
5956774709×
            .get(node)
5966774709×
            .into_iter()
5976774709×
            .flat_map(|ks| ks.iter())
5986774709×
            .filter_map(|k| self.m().modes.get(k).map(|(_, m)| (*k, *m)))
5996774709×
            .collect()
6006774709×
    }
601
602
    /// Every node that has at least one live placement.
6030×
    pub fn placed_nodes(&self) -> impl Iterator<Item = NodeId> + '_ {
6040×
        self.m().live_placements_of.keys().copied()
6050×
    }
606
607
    /// Resolve the tree: assign paths, find conflicts.
608
    /// The materialized tree (spec §7.1): computed once per graph and
609
    /// cloned for each caller.
6106412×
    pub fn view(&self) -> TreeView {
6116412×
        self.view_cache
6126412×
            .get_or_init(|| CachedView::new(self.compute_view()))
613
            .view
6146412×
            .clone()
6156412×
    }
616
61711936×
    fn compute_view(&self) -> TreeView {
61811936×
        let mut view = TreeView::default();
61911936×
        let mut entries: BTreeMap<String, TreeEntry> = BTreeMap::new();
620
621
        // Live placements grouped by parent.
62211936×
        let mut children: HashMap<NodeId, Vec<(OpKey, &Placement)>> = HashMap::new();
6236763083×
        for ks in self.m().live_placements_of.values() {
6246763096×
            for k in ks {
6256763096×
                if let Some(p) = self.m().placements.get(k) {
6266763096×
                    children.entry(p.parent).or_default().push((*k, p));
6276763096×
                }
628
            }
629
        }
63019208×
        for c in children.values_mut() {
63174676207×
            c.sort_by(|a, b| a.1.name.cmp(&b.1.name).then(a.0.cmp(&b.0)));
632
        }
633
634
        // Multi-placement and mode conflicts.
635
        // Only placed nodes: one with no live placement is not in the tree.
63611936×
        let mut nodes: Vec<NodeId> = self.m().live_placements_of.keys().copied().collect();
63711936×
        nodes.sort();
63811936×
        let mut multi: HashSet<NodeId> = HashSet::new();
639
        // Each node's mode and the atom it comes from, for the entries.
64011936×
        let mut modes: HashMap<NodeId, (Option<OpKey>, Mode)> = HashMap::new();
6416763083×
        for n in &nodes {
6426763083×
            let lp = self.live_placements(n);
643
            // One placement (nearly every node) cannot be in two places.
6446763083×
            if lp.len() > 1 {
64513×
                let distinct_places: BTreeSet<(&NodeId, &str)> = lp
64613×
                    .iter()
64726×
                    .map(|(_, p)| (&p.parent, p.name.as_str()))
64813×
                    .collect();
64913×
                if distinct_places.len() > 1 {
6502×
                    multi.insert(*n);
6512×
                    view.conflicts.push(TreeConflict::MultiPlacement {
6522×
                        node: *n,
6532×
                        placements: lp.iter().map(|(k, _)| *k).collect(),
654
                    });
65511×
                }
6566763070×
            }
6576763083×
            let lm = self.live_modes(n);
6586763083×
            if lm.len() > 1 {
6592×
                let distinct_modes: BTreeSet<Mode> = lm.iter().map(|(_, m)| *m).collect();
6602×
                if distinct_modes.len() > 1 {
6611×
                    view.conflicts.push(TreeConflict::Mode {
6621×
                        node: *n,
6631×
                        modes: distinct_modes.into_iter().collect(),
6641×
                    });
6651×
                }
6666763081×
            }
6676763083×
            let mode_atom = lm.iter().map(|(k, _)| *k).max();
6686763083×
            let mode = mode_atom
6696763083×
                .and_then(|k| self.m().modes.get(&k).map(|(_, m)| *m))
6706763083×
                .unwrap_or_default();
6716763083×
            modes.insert(*n, (mode_atom, mode));
672
        }
673
674
        // BFS from the root, assigning paths.
67511936×
        let mut reached: HashSet<NodeId> = HashSet::new();
67611936×
        reached.insert(NodeId::ROOT);
67711936×
        let mut queue: Vec<(NodeId, String)> = vec![(NodeId::ROOT, String::new())];
67811936×
        let mut on_path: HashSet<NodeId> = HashSet::new();
67932756×
        while let Some((dir, dir_path)) = queue.pop() {
68020820×
            let Some(kids) = children.get(&dir) else {
6811617×
                continue;
682
            };
683
            // Name conflicts within this directory: the children are sorted
684
            // by name, so each name's group is a run of them.
68519203×
            let mut groups: Vec<(&str, &[(OpKey, &Placement)])> = Vec::new();
68619203×
            let mut start = 0;
6876763090×
            for i in 1..=kids.len() {
6886763090×
                if i == kids.len() || kids[i].1.name != kids[start].1.name {
6896762799×
                    groups.push((kids[start].1.name.as_str(), &kids[start..i]));
6906762799×
                    start = i;
6916762799×
                }
692
            }
6936762799×
            for (name, group) in groups {
6946762799×
                let distinct: BTreeSet<NodeId> = group.iter().map(|(_, p)| p.node).collect();
6956762799×
                if distinct.len() > 1 {
696241×
                    view.conflicts.push(TreeConflict::Name {
697241×
                        parent: dir,
698241×
                        name: name.to_string(),
699241×
                        nodes: distinct.iter().copied().collect(),
700241×
                    });
7016762558×
                }
7026762799×
                let suffixed = distinct.len() > 1;
7036763090×
                for (i, (k, p)) in group.iter().enumerate() {
7046763090×
                    let node = p.node;
7056763090×
                    if node == dir || on_path.contains(&node) {
7060×
                        view.conflicts.push(TreeConflict::Cycle { node });
7070×
                        continue;
7086763090×
                    }
7096763090×
                    let needs_suffix = suffixed || multi.contains(&node);
7106763090×
                    let leaf = if needs_suffix {
711524×
                        format!("{name}.oxy-conflict-{}", i + 1)
712
                    } else {
7136762566×
                        name.to_string()
714
                    };
7156763090×
                    let path = if dir_path.is_empty() {
71617284×
                        leaf
717
                    } else {
7186745806×
                        format!("{dir_path}/{leaf}")
719
                    };
7206763090×
                    let kind = self.kind(&node).unwrap_or(NodeKind::File);
7216763090×
                    let (mode_atom, mode) = modes.get(&node).copied().unwrap_or_default();
7226763090×
                    entries.insert(
7236763090×
                        path.clone(),
7246763090×
                        TreeEntry {
7256763090×
                            path: path.clone(),
7266763090×
                            node,
7276763090×
                            kind,
7286763090×
                            mode,
7296763090×
                            placement: *k,
7306763090×
                            mode_atom,
7316763090×
                        },
732
                    );
7336763090×
                    if kind == NodeKind::Dir && reached.insert(node) {
7348884×
                        on_path.insert(dir);
7358884×
                        queue.push((node, path));
7366754206×
                    } else {
7376754206×
                        reached.insert(node);
7386754206×
                    }
739
                }
740
            }
741
        }
742
743
        // Nodes with live placements that were never reached: orphans or cycles.
7446763083×
        for n in &nodes {
7456763083×
            if reached.contains(n) {
7466763078×
                continue;
7475×
            }
7485×
            let lp = self.live_placements(n);
7495×
            if lp.is_empty() {
7500×
                continue;
7515×
            }
7525×
            let mut seen = HashSet::new();
7535×
            let mut cur = *n;
7545×
            let conflict = loop {
75512×
                if !seen.insert(cur) {
7562×
                    break TreeConflict::Cycle { node: *n };
75710×
                }
75810×
                let lp = self.live_placements(&cur);
75910×
                let Some((_, p)) = lp.first() else {
7603×
                    break TreeConflict::Orphan {
7613×
                        node: *n,
7623×
                        parent: cur,
7633×
                    };
764
                };
7657×
                if reached.contains(&p.parent) {
766
                    // Parent reached but this node was not: the parent is not a
767
                    // directory, so this is a name/kind problem surfaced as orphan.
7680×
                    break TreeConflict::Orphan {
7690×
                        node: *n,
7700×
                        parent: p.parent,
7710×
                    };
7727×
                }
7737×
                cur = p.parent;
774
            };
7755×
            if !view.conflicts.contains(&conflict) {
7765×
                view.conflicts.push(conflict);
7775×
            }
778
        }
77911936×
        view.entries = std::sync::Arc::new(entries);
78011936×
        view
78111936×
    }
782
}
783
784
impl TreeGraph {
785
    /// Serialize for a checkpoint.
786400×
    pub fn to_value(&self) -> crate::cbor::Value {
787
        use crate::cbor::Value;
7884319×
        let opkey = |k: &OpKey| vec![Value::Bytes(k.0 .0.to_vec()), Value::Uint(k.1 as u64)];
789800×
        let deleters = |m: &Map<OpKey, BTreeSet<ChangeHash>>| {
790800×
            let mut ks: Vec<&OpKey> = m.keys().collect();
791800×
            ks.sort();
792
            Value::Array(
793800×
                ks.into_iter()
794800×
                    .map(|k| {
795257×
                        let mut v = opkey(k);
796257×
                        v.push(Value::Array(
797257×
                            m[k].iter().map(|d| Value::Bytes(d.0.to_vec())).collect(),
798
                        ));
799257×
                        Value::Array(v)
800257×
                    })
801800×
                    .collect(),
802
            )
803800×
        };
804400×
        let mut nodes: Vec<&NodeId> = self.m().kinds.keys().collect();
805400×
        nodes.sort();
806400×
        let mut pks: Vec<&OpKey> = self.m().placements.keys().collect();
807400×
        pks.sort();
808400×
        let mut mks: Vec<&OpKey> = self.m().modes.keys().collect();
809400×
        mks.sort();
810400×
        Value::map([
811
            (
812
                0,
813
                Value::Array(
814400×
                    nodes
815400×
                        .into_iter()
8162206×
                        .map(|n| {
8172206×
                            Value::Array(vec![
8182206×
                                Value::Bytes(n.0.to_vec()),
8192206×
                                Value::Uint(self.m().kinds[n].tag()),
8202206×
                                self.m()
8212206×
                                    .introduced
8222206×
                                    .get(n)
8232206×
                                    .map(|h| Value::Bytes(h.0.to_vec()))
8242206×
                                    .unwrap_or(Value::Null),
825
                            ])
8262206×
                        })
827400×
                        .collect(),
828
                ),
829
            ),
830
            (
831
                1,
832
                Value::Array(
833400×
                    pks.into_iter()
8342219×
                        .map(|k| {
8352219×
                            let p = &self.m().placements[k];
8362219×
                            let mut v = opkey(k);
8372219×
                            v.extend([
8382219×
                                Value::Bytes(p.node.0.to_vec()),
8392219×
                                Value::Bytes(p.parent.0.to_vec()),
8402219×
                                Value::Text(p.name.clone()),
8412219×
                            ]);
8422219×
                            Value::Array(v)
8432219×
                        })
844400×
                        .collect(),
845
                ),
846
            ),
847400×
            (2, deleters(&self.m().deleted_placements)),
848
            (
849
                3,
850
                Value::Array(
851400×
                    mks.into_iter()
8521843×
                        .map(|k| {
8531843×
                            let (n, m) = &self.m().modes[k];
8541843×
                            let mut v = opkey(k);
8551843×
                            v.extend([Value::Bytes(n.0.to_vec()), Value::Uint(m.bits())]);
8561843×
                            Value::Array(v)
8571843×
                        })
858400×
                        .collect(),
859
                ),
860
            ),
861400×
            (4, deleters(&self.m().deleted_modes)),
862
        ])
863400×
    }
864
86599×
    pub fn from_value(v: &crate::cbor::Value) -> Result<TreeGraph, crate::objects::ObjectError> {
866
        use crate::objects::{array, bytes, field, map, oref, text, u32_, uint, ObjectError};
86799×
        let m = map(v, "tree graph")?;
8681743×
        let node = |v: &crate::cbor::Value| {
8691743×
            NodeId::from_slice(bytes(v, "node")?)
8701743×
                .ok_or_else(|| ObjectError::Schema("node: expected 16 bytes".into()))
8711743×
        };
872880×
        let opkey = |e: &[crate::cbor::Value]| -> Result<OpKey, ObjectError> {
873880×
            Ok((oref(&e[0], "op change")?, u32_(&e[1], "op index")?))
874880×
        };
87599×
        let mut g = TreeGraph::default();
876443×
        for n in array(field(m, 0, "nodes")?, "nodes")? {
877443×
            let e = array(n, "node entry")?;
878443×
            if e.len() != 3 {
8790×
                return Err(ObjectError::Schema("node entry: expected 3 fields".into()));
880443×
            }
881443×
            let id = node(&e[0])?;
882443×
            g.m_mut()
883443×
                .kinds
884443×
                .insert(id, NodeKind::from_tag(uint(&e[1], "kind")?)?);
885443×
            if !e[2].is_null() {
886443×
                g.m_mut().introduced.insert(id, oref(&e[2], "introducer")?);
8870×
            }
888
        }
889445×
        for p in array(field(m, 1, "placements")?, "placements")? {
890445×
            let e = array(p, "placement")?;
891445×
            if e.len() != 5 {
8920×
                return Err(ObjectError::Schema("placement: expected 5 fields".into()));
893445×
            }
894445×
            let k = opkey(e)?;
895445×
            let pl = Placement {
896445×
                node: node(&e[2])?,
897445×
                parent: node(&e[3])?,
898445×
                name: text(&e[4], "name")?.to_owned(),
899
            };
900445×
            g.m_mut()
901445×
                .placements_of
902445×
                .entry(pl.node)
903445×
                .or_default()
904445×
                .insert(k);
905445×
            g.m_mut().placements.insert(k, pl);
906
        }
90799×
        let deleters = |v: &crate::cbor::Value,
908
                        what: &str|
909198×
         -> Result<Map<OpKey, BTreeSet<ChangeHash>>, ObjectError> {
910198×
            let mut out = Map::default();
911198×
            for d in array(v, what)? {
91225×
                let e = array(d, what)?;
91325×
                if e.len() != 3 {
9140×
                    return Err(ObjectError::Schema(format!("{what}: expected 3 fields")));
91525×
                }
91625×
                out.insert(
91725×
                    opkey(e)?,
91825×
                    array(&e[2], "deleters")?
91925×
                        .iter()
92025×
                        .map(|x| oref(x, "deleter"))
92125×
                        .collect::<Result<BTreeSet<_>, _>>()?,
922
                );
923
            }
924198×
            Ok(out)
925198×
        };
92699×
        g.m_mut().deleted_placements =
92799×
            deleters(field(m, 2, "deleted placements")?, "deleted placement")?;
928410×
        for md in array(field(m, 3, "modes")?, "modes")? {
929410×
            let e = array(md, "mode")?;
930410×
            if e.len() != 4 {
9310×
                return Err(ObjectError::Schema("mode: expected 4 fields".into()));
932410×
            }
933410×
            let k = opkey(e)?;
934410×
            let n = node(&e[2])?;
935410×
            g.m_mut()
936410×
                .modes
937410×
                .insert(k, (n, Mode::from_bits(uint(&e[3], "mode bits")?)?));
938410×
            g.m_mut().modes_of.entry(n).or_default().insert(k);
939
        }
94099×
        g.m_mut().deleted_modes = deleters(field(m, 4, "deleted modes")?, "deleted mode")?;
94199×
        let keys: Vec<OpKey> = g.m_mut().placements.keys().copied().collect();
942445×
        for k in keys {
943445×
            g.index_placement(k);
944445×
        }
94599×
        let keys: Vec<OpKey> = g.m_mut().modes.keys().copied().collect();
946410×
        for k in keys {
947410×
            g.index_mode(k);
948410×
        }
94999×
        Ok(g)
95099×
    }
951
}
952
953
/// The tree in the flat layout of a local index (oxygen#41), with its view
954
/// when that has no conflicts, so a loaded tree need not work it out again.
955
impl TreeGraph {
956786×
    pub(crate) fn write_flat(&self, w: &mut crate::flat::Writer) {
957130436×
        let key = |w: &mut crate::flat::Writer, k: &OpKey| {
958130436×
            w.object(&k.0);
959130436×
            w.u32(k.1);
960130436×
        };
961
        // The maps as a block of their own: a reader keeps it undecoded
962
        // until something needs them.
963786×
        let outer = std::mem::take(w);
964786×
        let mut kinds: Vec<(&NodeId, &NodeKind)> = self.m().kinds.iter().collect();
965786×
        kinds.sort_by_key(|(n, _)| **n);
966786×
        w.count(kinds.len());
96732630×
        for (n, k) in kinds {
96832630×
            w.fixed(&n.0);
96932630×
            w.u8(k.tag() as u8);
97032630×
        }
971786×
        let mut intro: Vec<(&NodeId, &ChangeHash)> = self.m().introduced.iter().collect();
972786×
        intro.sort();
973786×
        w.count(intro.len());
97432630×
        for (n, c) in intro {
97532630×
            w.fixed(&n.0);
97632630×
            w.object(c);
97732630×
        }
978786×
        let mut pl: Vec<(&OpKey, &Placement)> = self.m().placements.iter().collect();
979786×
        pl.sort_by_key(|(k, _)| **k);
980786×
        w.count(pl.len());
98132630×
        for (k, p) in pl {
98232630×
            key(w, k);
98332630×
            w.fixed(&p.node.0);
98432630×
            w.fixed(&p.parent.0);
98532630×
            w.bytes(p.name.as_bytes());
98632630×
        }
987786×
        let mut modes: Vec<(&OpKey, &(NodeId, Mode))> = self.m().modes.iter().collect();
988786×
        modes.sort_by_key(|(k, _)| **k);
989786×
        w.count(modes.len());
99032588×
        for (k, (n, m)) in modes {
99132588×
            key(w, k);
99232588×
            w.fixed(&n.0);
99332588×
            w.u8(m.bits() as u8);
99432588×
        }
9951572×
        for m in [&self.m().deleted_placements, &self.m().deleted_modes] {
9961572×
            let mut ks: Vec<(&OpKey, &BTreeSet<ChangeHash>)> = m.iter().collect();
9971572×
            ks.sort_by_key(|(k, _)| **k);
9981572×
            w.count(ks.len());
9991572×
            for (k, by) in ks {
10000×
                key(w, k);
10010×
                w.count(by.len());
10020×
                for c in by {
10030×
                    w.object(c);
10040×
                }
1005
            }
1006
        }
1007786×
        let maps = std::mem::replace(w, outer);
1008786×
        w.bytes(&maps.0);
1009
        // The introducers again, alone, for a reader that needs no more.
1010786×
        let mut iw = crate::flat::Writer::default();
1011786×
        let mut intro: Vec<(&NodeId, &ChangeHash)> = self.m().introduced.iter().collect();
1012786×
        intro.sort();
1013786×
        iw.count(intro.len());
101432630×
        for (n, c) in intro {
101532630×
            iw.fixed(&n.0);
101632630×
            iw.object(c);
101732630×
        }
1018786×
        w.bytes(&iw.0);
1019
        // The view as a block of its own.
1020786×
        let outer = std::mem::take(w);
1021786×
        let view = self.view();
1022786×
        if view.conflicts.is_empty() {
1023786×
            w.u8(1);
1024786×
            w.count(view.entries.len());
102532630×
            for (path, e) in view.entries.iter() {
102632630×
                w.bytes(path.as_bytes());
102732630×
                w.fixed(&e.node.0);
102832630×
                w.u8(e.kind.tag() as u8);
102932630×
                w.u8(e.mode.bits() as u8);
103032630×
                key(w, &e.placement);
103132630×
                match &e.mode_atom {
103242×
                    None => w.u8(0),
103332588×
                    Some(k) => {
103432588×
                        w.u8(1);
103532588×
                        key(w, k);
103632588×
                    }
1037
                }
1038
            }
10390×
        } else {
10400×
            w.u8(0);
10410×
        }
1042786×
        let view_bytes = std::mem::replace(w, outer);
1043786×
        w.bytes(&view_bytes.0);
1044786×
    }
1045
10461646×
    pub(crate) fn read_flat(
10471646×
        r: &mut crate::flat::Reader,
10481646×
    ) -> Result<TreeGraph, crate::objects::ObjectError> {
10491646×
        let maps = r.bytes()?;
10501646×
        let introduced = r.bytes()?;
10511646×
        let view = Self::read_view(r.bytes()?)?;
10521646×
        let mut g = TreeGraph {
10531646×
            raw: Some(std::sync::Arc::new(maps.to_vec())),
10541646×
            raw_introduced: Some(std::sync::Arc::new(introduced.to_vec())),
10551646×
            ..TreeGraph::default()
10561646×
        };
10571646×
        if let Some(view) = view {
1058721×
            // Checked on a copy, so the graph itself stays undecoded.
1059721×
            #[cfg(test)]
1060925×
            assert_eq!(
1061721×
                view,
1062925×
                TreeGraph {
1063925×
                    raw: g.raw.clone(),
1064925×
                    ..TreeGraph::default()
1065925×
                }
1066925×
                .compute_view(),
1067721×
                "an index's view is the tree's"
1068721×
            );
10691646×
            g.view_cache = std::sync::OnceLock::from(CachedView::new(view));
1070721×
        }
10711646×
        Ok(g)
10721646×
    }
1073
}
1074
1075
impl TreeMaps {
1076
    /// The maps block of a tree's flat form.
10772513×
    fn decode(bytes: &[u8]) -> Result<TreeMaps, crate::objects::ObjectError> {
1078
        use crate::objects::ObjectError;
10792513×
        let _t = crate::timing::phase("index: tree maps");
1080164787×
        let node = |r: &mut crate::flat::Reader| -> Result<NodeId, ObjectError> {
1081164787×
            Ok(NodeId(r.fixed::<16>()?))
1082164787×
        };
108365889×
        let key = |r: &mut crate::flat::Reader| -> Result<OpKey, ObjectError> {
108465889×
            Ok((r.object()?, r.u32()?))
108565889×
        };
10862513×
        let r = &mut crate::flat::Reader::new(bytes);
10872513×
        let mut g = TreeGraph::new();
10882513×
        for _ in 0..r.count()? {
108932966×
            let n = node(r)?;
109032966×
            g.m_mut()
109132966×
                .kinds
109232966×
                .insert(n, NodeKind::from_tag(r.u8()? as u64)?);
1093
        }
10942513×
        for _ in 0..r.count()? {
109532966×
            let n = node(r)?;
109632966×
            g.m_mut().introduced.insert(n, r.object()?);
1097
        }
10982513×
        for _ in 0..r.count()? {
109932966×
            let k = key(r)?;
110032966×
            let p = Placement {
110132966×
                node: node(r)?,
110232966×
                parent: node(r)?,
110332966×
                name: r.text()?,
1104
            };
110532966×
            g.m_mut().placements_of.entry(p.node).or_default().insert(k);
110632966×
            g.m_mut().placements.insert(k, p);
1107
        }
11082513×
        for _ in 0..r.count()? {
110932923×
            let k = key(r)?;
111032923×
            let n = node(r)?;
111132923×
            g.m_mut()
111232923×
                .modes
111332923×
                .insert(k, (n, Mode::from_bits(r.u8()? as u64)?));
111432923×
            g.m_mut().modes_of.entry(n).or_default().insert(k);
1115
        }
11165026×
        for i in 0..2 {
11175026×
            let mut m: Map<OpKey, BTreeSet<ChangeHash>> = Map::default();
11185026×
            for _ in 0..r.count()? {
11190×
                let k = key(r)?;
11200×
                let mut by = BTreeSet::new();
11210×
                for _ in 0..r.count()? {
11220×
                    by.insert(r.object()?);
1123
                }
11240×
                m.insert(k, by);
1125
            }
11265026×
            if i == 0 {
11272513×
                g.m_mut().deleted_placements = m;
11282513×
            } else {
11292513×
                g.m_mut().deleted_modes = m;
11302513×
            }
1131
        }
11322513×
        if !r.at_end() {
11330×
            return Err(ObjectError::Schema("state index: tree maps".into()));
11342513×
        }
11352513×
        let keys: Vec<OpKey> = g.m().placements.keys().copied().collect();
113632966×
        for k in keys {
113732966×
            g.index_placement(k);
113832966×
        }
11392513×
        let keys: Vec<OpKey> = g.m().modes.keys().copied().collect();
114032923×
        for k in keys {
114132923×
            g.index_mode(k);
114232923×
        }
11432513×
        Ok(g.maps.into_inner().unwrap_or_default())
11442513×
    }
1145
}
1146
1147
impl TreeGraph {
1148
    /// The view block of a tree's flat form, when it holds one.
11491646×
    fn read_view(bytes: &[u8]) -> Result<Option<TreeView>, crate::objects::ObjectError> {
11501646×
        let _t = crate::timing::phase("index: view");
11511646×
        let mut r = crate::flat::Reader::new(bytes);
11521646×
        if r.u8()? != 1 {
11530×
            return Ok(None);
11541646×
        }
115533250×
        let key = |r: &mut crate::flat::Reader| -> Result<OpKey, crate::objects::ObjectError> {
115633250×
            Ok((r.object()?, r.u32()?))
115733250×
        };
11581646×
        let n = r.count()?;
1159
        // Collected, then built in one step: the map is made from sorted
1160
        // input in a single pass rather than by searching for each insert.
11611646×
        let mut entries = Vec::with_capacity(n);
11621646×
        for _ in 0..n {
116316636×
            let path = r.text()?;
116416636×
            let e = TreeEntry {
116516636×
                path: path.clone(),
116616636×
                node: NodeId(r.fixed::<16>()?),
116716636×
                kind: NodeKind::from_tag(r.u8()? as u64)?,
116816636×
                mode: Mode::from_bits(r.u8()? as u64)?,
116916636×
                placement: key(&mut r)?,
117016636×
                mode_atom: match r.u8()? {
117122×
                    0 => None,
117216614×
                    _ => Some(key(&mut r)?),
1173
                },
1174
            };
117516636×
            entries.push((path, e));
1176
        }
11771646×
        Ok(Some(TreeView {
11781646×
            entries: std::sync::Arc::new(entries.into_iter().collect()),
11791646×
            conflicts: Vec::new(),
11801646×
        }))
11811646×
    }
1182
}
1183
1184
/// The introducers block of a tree's flat form.
118558×
fn read_introduced(bytes: &[u8]) -> Result<Map<NodeId, ChangeHash>, crate::objects::ObjectError> {
118658×
    let r = &mut crate::flat::Reader::new(bytes);
118758×
    let n = r.count()?;
118858×
    let mut m = Map::default();
118958×
    m.reserve(n);
119058×
    for _ in 0..n {
11910×
        let node = NodeId(r.fixed::<16>()?);
11920×
        m.insert(node, r.object()?);
1193
    }
119458×
    Ok(m)
119558×
}
1196
119711678×
fn join(dir: &str, name: &str) -> String {
119811678×
    if dir.is_empty() {
11993785×
        name.to_string()
1200
    } else {
12017893×
        format!("{dir}/{name}")
1202
    }
120311678×
}
1204
12052215×
pub fn op_key(r: OpRef) -> OpKey {
12062215×
    (r.change, r.index)
12072215×
}
1208
1209
#[cfg(test)]
1210
mod tests {
1211
    use super::*;
1212
    use crate::hash::ObjectRef;
1213
121454×
    fn h(n: u8) -> ChangeHash {
121554×
        ObjectRef([n; 32])
121654×
    }
121751×
    fn nid(n: u8) -> NodeId {
121851×
        NodeId([n; 16])
121951×
    }
122014×
    fn add(g: &mut TreeGraph, c: u8, i: u32, node: u8, kind: NodeKind, parent: NodeId, name: &str) {
122114×
        g.apply(
122214×
            h(c),
122314×
            i,
122414×
            &TreeOp::AddNode {
122514×
                node: nid(node),
122614×
                kind,
122714×
                mode: Mode::TEXT,
122814×
                parent,
122914×
                name: name.into(),
123014×
            },
1231
        );
123214×
    }
12337×
    fn paths(v: &TreeView) -> Vec<String> {
12347×
        v.entries.keys().cloned().collect()
12357×
    }
1236
1237
    /// Each op applied to a graph whose view is cached keeps it up to date
1238
    /// or drops it: `apply` checks every kept view against a full one.
1239
    #[test]
12401×
    fn cached_view_follows_ops() {
12411×
        let at = |c: u8, i: u32| OpRef {
12424×
            change: h(c),
12434×
            index: i,
12444×
        };
12451×
        let mut g = TreeGraph::new();
12461×
        let ops = [
12471×
            TreeOp::AddNode {
12481×
                node: nid(1),
12491×
                kind: NodeKind::Dir,
12501×
                mode: Mode::TEXT,
12511×
                parent: NodeId::ROOT,
12521×
                name: "src".into(),
12531×
            },
12541×
            TreeOp::AddNode {
12551×
                node: nid(2),
12561×
                kind: NodeKind::File,
12571×
                mode: Mode::TEXT,
12581×
                parent: nid(1),
12591×
                name: "a.rs".into(),
12601×
            },
12611×
            TreeOp::SetMode {
12621×
                node: nid(2),
12631×
                old: at(1, 1),
12641×
                mode: Mode {
12651×
                    exec: true,
12661×
                    opaque: false,
12671×
                },
12681×
            },
12691×
            TreeOp::Move {
12701×
                node: nid(2),
12711×
                old: at(1, 1),
12721×
                parent: NodeId::ROOT,
12731×
                name: "b.rs".into(),
12741×
            },
12751×
            // Moving an empty directory, then removing it.
12761×
            TreeOp::Move {
12771×
                node: nid(1),
12781×
                old: at(1, 0),
12791×
                parent: NodeId::ROOT,
12801×
                name: "lib".into(),
12811×
            },
12821×
            TreeOp::RemoveNode {
12831×
                node: nid(1),
12841×
                placement: at(1, 4),
12851×
            },
12861×
            // A name taken twice: a conflict, so the view is computed again.
12871×
            TreeOp::AddNode {
12881×
                node: nid(3),
12891×
                kind: NodeKind::File,
12901×
                mode: Mode::TEXT,
12911×
                parent: NodeId::ROOT,
12921×
                name: "b.rs".into(),
12931×
            },
12941×
        ];
12957×
        for (i, op) in ops.iter().enumerate() {
12967×
            let _ = g.view();
12977×
            g.apply(h(1), i as u32, op);
12987×
            assert_eq!(g.view(), g.compute_view());
1299
        }
13001×
        let v = g.view();
13011×
        assert_eq!(paths(&v), ["b.rs.oxy-conflict-1", "b.rs.oxy-conflict-2"]);
13021×
        assert!(v.entries.values().any(|e| e.mode.exec));
13031×
    }
1304
1305
    #[test]
13061×
    fn nested_paths_and_rename() {
13071×
        let mut g = TreeGraph::new();
13081×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "src");
13091×
        add(&mut g, 1, 1, 2, NodeKind::File, nid(1), "main.rs");
13101×
        add(&mut g, 1, 2, 3, NodeKind::File, NodeId::ROOT, "README");
13111×
        let v = g.view();
13121×
        assert_eq!(paths(&v), ["README", "src", "src/main.rs"]);
13131×
        assert!(!v.is_conflicted());
1314
1315
        // Rename src/main.rs → src/lib.rs, move src → lib (subtree follows).
13161×
        g.apply(
13171×
            h(2),
1318
            0,
13191×
            &TreeOp::Move {
13201×
                node: nid(2),
13211×
                old: OpRef {
13221×
                    change: h(1),
13231×
                    index: 1,
13241×
                },
13251×
                parent: nid(1),
13261×
                name: "lib.rs".into(),
13271×
            },
1328
        );
13291×
        g.apply(
13301×
            h(2),
1331
            1,
13321×
            &TreeOp::Move {
13331×
                node: nid(1),
13341×
                old: OpRef {
13351×
                    change: h(1),
13361×
                    index: 0,
13371×
                },
13381×
                parent: NodeId::ROOT,
13391×
                name: "lib".into(),
13401×
            },
1341
        );
13421×
        let v = g.view();
13431×
        assert_eq!(paths(&v), ["README", "lib", "lib/lib.rs"]);
13441×
        assert_eq!(v.entries["lib/lib.rs"].placement, (h(2), 0));
1345
13461×
        g.apply(
13471×
            h(3),
1348
            0,
13491×
            &TreeOp::RemoveNode {
13501×
                node: nid(3),
13511×
                placement: OpRef {
13521×
                    change: h(1),
13531×
                    index: 2,
13541×
                },
13551×
            },
1356
        );
13571×
        assert_eq!(paths(&g.view()), ["lib", "lib/lib.rs"]);
13581×
    }
1359
1360
    #[test]
13611×
    fn name_conflict_gets_suffixes() {
13621×
        let mut g = TreeGraph::new();
13631×
        add(&mut g, 1, 0, 1, NodeKind::File, NodeId::ROOT, "a.txt");
13641×
        add(&mut g, 2, 0, 2, NodeKind::File, NodeId::ROOT, "a.txt");
13651×
        let v = g.view();
13661×
        assert_eq!(paths(&v), ["a.txt.oxy-conflict-1", "a.txt.oxy-conflict-2"]);
13671×
        assert_eq!(
1368
            v.conflicts,
13691×
            vec![TreeConflict::Name {
13701×
                parent: NodeId::ROOT,
13711×
                name: "a.txt".into(),
13721×
                nodes: vec![nid(1), nid(2)]
13731×
            }]
1374
        );
13751×
    }
1376
1377
    #[test]
13781×
    fn concurrent_renames_are_multi_placement() {
13791×
        let mut g = TreeGraph::new();
13801×
        add(&mut g, 1, 0, 1, NodeKind::File, NodeId::ROOT, "a");
13811×
        g.apply(
13821×
            h(2),
1383
            0,
13841×
            &TreeOp::Move {
13851×
                node: nid(1),
13861×
                old: OpRef {
13871×
                    change: h(1),
13881×
                    index: 0,
13891×
                },
13901×
                parent: NodeId::ROOT,
13911×
                name: "b".into(),
13921×
            },
1393
        );
13941×
        g.apply(
13951×
            h(3),
1396
            0,
13971×
            &TreeOp::Move {
13981×
                node: nid(1),
13991×
                old: OpRef {
14001×
                    change: h(1),
14011×
                    index: 0,
14021×
                },
14031×
                parent: NodeId::ROOT,
14041×
                name: "c".into(),
14051×
            },
1406
        );
14071×
        let v = g.view();
14081×
        assert_eq!(paths(&v), ["b.oxy-conflict-1", "c.oxy-conflict-1"]);
14091×
        assert!(
14101×
            matches!(v.conflicts[0], TreeConflict::MultiPlacement { node, .. } if node == nid(1))
1411
        );
14121×
    }
1413
1414
    #[test]
14151×
    fn orphan_and_cycle() {
14161×
        let mut g = TreeGraph::new();
14171×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "d");
14181×
        add(&mut g, 1, 1, 2, NodeKind::File, nid(1), "f");
1419
        // Concurrently: 2 removes d, 3 adds d/g.
14201×
        g.apply(
14211×
            h(2),
1422
            0,
14231×
            &TreeOp::RemoveNode {
14241×
                node: nid(1),
14251×
                placement: OpRef {
14261×
                    change: h(1),
14271×
                    index: 0,
14281×
                },
14291×
            },
1430
        );
14311×
        add(&mut g, 3, 0, 3, NodeKind::File, nid(1), "g");
14321×
        let v = g.view();
14331×
        assert_eq!(paths(&v), Vec::<String>::new());
14341×
        assert!(v.conflicts.contains(&TreeConflict::Orphan {
14351×
            node: nid(2),
14361×
            parent: nid(1)
14371×
        }));
14381×
        assert!(v.conflicts.contains(&TreeConflict::Orphan {
14391×
            node: nid(3),
14401×
            parent: nid(1)
14411×
        }));
1442
1443
        // Cycle: a/b, then concurrently move a under b and b under a's parent... simplest: move a into b.
14441×
        let mut g = TreeGraph::new();
14451×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "a");
14461×
        add(&mut g, 1, 1, 2, NodeKind::Dir, nid(1), "b");
14471×
        g.apply(
14481×
            h(2),
1449
            0,
14501×
            &TreeOp::Move {
14511×
                node: nid(1),
14521×
                old: OpRef {
14531×
                    change: h(1),
14541×
                    index: 0,
14551×
                },
14561×
                parent: nid(2),
14571×
                name: "a".into(),
14581×
            },
1459
        );
14601×
        let v = g.view();
14611×
        assert!(
14621×
            v.conflicts
14631×
                .iter()
14641×
                .any(|c| matches!(c, TreeConflict::Cycle { .. })),
1465
            "{:?}",
1466
            v.conflicts
1467
        );
14681×
    }
1469
1470
    #[test]
14711×
    fn serialization_round_trip() {
14721×
        let mut g = TreeGraph::new();
14731×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "src");
14741×
        add(&mut g, 1, 1, 2, NodeKind::File, nid(1), "main.rs");
14751×
        g.apply(
14761×
            h(2),
1477
            0,
14781×
            &TreeOp::Move {
14791×
                node: nid(2),
14801×
                old: OpRef {
14811×
                    change: h(1),
14821×
                    index: 1,
14831×
                },
14841×
                parent: nid(1),
14851×
                name: "lib.rs".into(),
14861×
            },
1487
        );
14881×
        g.apply(
14891×
            h(3),
1490
            0,
14911×
            &TreeOp::SetMode {
14921×
                node: nid(2),
14931×
                old: OpRef {
14941×
                    change: h(1),
14951×
                    index: 1,
14961×
                },
14971×
                mode: Mode {
14981×
                    exec: true,
14991×
                    opaque: false,
15001×
                },
15011×
            },
1502
        );
15031×
        let bytes = crate::cbor::encode(&g.to_value());
15041×
        let back = TreeGraph::from_value(&crate::cbor::decode(&bytes).unwrap()).unwrap();
15051×
        assert_eq!(back.view(), g.view());
15061×
        assert_eq!(back.introducer(&nid(2)), Some(h(1)));
15071×
        assert_eq!(crate::cbor::encode(&back.to_value()), bytes);
15081×
    }
1509
1510
    #[test]
15111×
    fn mode_conflict_and_resolution() {
15121×
        let mut g = TreeGraph::new();
15131×
        add(&mut g, 1, 0, 1, NodeKind::File, NodeId::ROOT, "run.sh");
15141×
        g.apply(
15151×
            h(2),
1516
            0,
15171×
            &TreeOp::SetMode {
15181×
                node: nid(1),
15191×
                old: OpRef {
15201×
                    change: h(1),
15211×
                    index: 0,
15221×
                },
15231×
                mode: Mode {
15241×
                    exec: true,
15251×
                    opaque: false,
15261×
                },
15271×
            },
1528
        );
15291×
        g.apply(
15301×
            h(3),
1531
            0,
15321×
            &TreeOp::SetMode {
15331×
                node: nid(1),
15341×
                old: OpRef {
15351×
                    change: h(1),
15361×
                    index: 0,
15371×
                },
15381×
                mode: Mode {
15391×
                    exec: false,
15401×
                    opaque: true,
15411×
                },
15421×
            },
1543
        );
15441×
        let v = g.view();
15451×
        assert!(matches!(v.conflicts[0], TreeConflict::Mode { .. }));
1546
        // Materialized with the greatest mode atom.
15471×
        assert_eq!(
15481×
            v.entries["run.sh"].mode,
1549
            Mode {
1550
                exec: false,
1551
                opaque: true
1552
            }
1553
        );
1554
        // The placement introduced by the same AddNode is unaffected.
15551×
        assert_eq!(v.entries["run.sh"].placement, (h(1), 0));
1556
        // Resolution: retire both live mode atoms; identical live values do not conflict.
15571×
        g.apply(
15581×
            h(4),
1559
            0,
15601×
            &TreeOp::SetMode {
15611×
                node: nid(1),
15621×
                old: OpRef {
15631×
                    change: h(2),
15641×
                    index: 0,
15651×
                },
15661×
                mode: Mode {
15671×
                    exec: true,
15681×
                    opaque: false,
15691×
                },
15701×
            },
1571
        );
15721×
        g.apply(
15731×
            h(4),
1574
            1,
15751×
            &TreeOp::SetMode {
15761×
                node: nid(1),
15771×
                old: OpRef {
15781×
                    change: h(3),
15791×
                    index: 0,
15801×
                },
15811×
                mode: Mode {
15821×
                    exec: true,
15831×
                    opaque: false,
15841×
                },
15851×
            },
1586
        );
15871×
        let v = g.view();
15881×
        assert!(!v.is_conflicted(), "{:?}", v.conflicts);
15891×
        assert_eq!(
15901×
            v.entries["run.sh"].mode,
1591
            Mode {
1592
                exec: true,
1593
                opaque: false
1594
            }
1595
        );
15961×
    }
1597
}