OXYGENHUB

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

1283 of 1372 lines run, 206 of 234 functions · run #365 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 {
27283712×
    fn insert(&mut self, k: OpKey) {
28169×
        match self {
29283497×
            KeySet::Empty => *self = KeySet::One(k),
30169×
            KeySet::One(a) if *a == k => {}
31169×
            KeySet::One(a) => {
32169×
                let a = *a;
33169×
                *self = KeySet::Many(if a < k { vec![a, k] } else { vec![k, a] });
34
            }
3546×
            KeySet::Many(v) => {
3646×
                if let Err(i) = v.binary_search(&k) {
3746×
                    v.insert(i, k);
3846×
                }
39
            }
40
        }
41283712×
    }
42679×
    fn remove(&mut self, k: &OpKey) {
43666×
        match self {
44666×
            KeySet::One(a) if a == k => *self = KeySet::Empty,
4513×
            KeySet::Many(v) => {
4613×
                if let Ok(i) = v.binary_search(k) {
4712×
                    v.remove(i);
4812×
                }
4913×
                if v.len() == 1 {
5012×
                    *self = KeySet::One(v[0]);
5112×
                } else if v.is_empty() {
520×
                    *self = KeySet::Empty;
531×
                }
54
            }
5570×
            _ => {}
56
        }
57679×
    }
5820309665×
    fn as_slice(&self) -> &[OpKey] {
5920309665×
        match self {
600×
            KeySet::Empty => &[],
6120309622×
            KeySet::One(a) => std::slice::from_ref(a),
6243×
            KeySet::Many(v) => v,
63
        }
6420309665×
    }
6520297338×
    fn iter(&self) -> std::slice::Iter<'_, OpKey> {
6620297338×
        self.as_slice().iter()
6720297338×
    }
6812327×
    fn len(&self) -> usize {
6912327×
        self.as_slice().len()
7012327×
    }
71679×
    fn is_empty(&self) -> bool {
72679×
        matches!(self, KeySet::Empty)
73679×
    }
74
}
75
76
impl<'a> IntoIterator for &'a KeySet {
77
    type Item = &'a OpKey;
78
    type IntoIter = std::slice::Iter<'a, OpKey>;
796764903×
    fn into_iter(self) -> Self::IntoIter {
806764903×
        self.iter()
816764903×
    }
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 {
1684422×
    fn new(view: TreeView) -> CachedView {
1694422×
        let mut dirs: HashMap<NodeId, String> = view
1704422×
            .entries
1714422×
            .values()
17239290×
            .filter(|e| e.kind == NodeKind::Dir)
1734422×
            .map(|e| (e.node, e.path.clone()))
1744422×
            .collect();
1754422×
        dirs.insert(NodeId::ROOT, String::new());
1764422×
        CachedView { view, dirs }
1774422×
    }
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
    /// Nodes added at a place another node holds with identical content
188
    /// (spec §9.2), each with the node the view shows there in its stead:
189
    /// one file to every reader, and retired by the first change that
190
    /// touches the node shown ([`TreeGraph::unify`]).
191
    pub unified: BTreeMap<NodeId, NodeId>,
192
}
193
194
impl TreeView {
1952729×
    pub fn is_conflicted(&self) -> bool {
1962729×
        !self.conflicts.is_empty()
1972729×
    }
1981486×
    pub fn by_node(&self) -> HashMap<NodeId, &TreeEntry> {
1999749×
        self.entries.values().map(|e| (e.node, e)).collect()
2001486×
    }
201
}
202
203
impl TreeGraph {
2043233×
    pub fn new() -> Self {
2053233×
        Self::default()
2063233×
    }
207
208
    /// The graph's maps, decoded from a state index on first use.
20948353555×
    fn m(&self) -> &TreeMaps {
21048353555×
        self.maps.get_or_init(|| match &self.raw {
2113223×
            Some(raw) => {
2123223×
                TreeMaps::decode(raw).expect("a state index is checked against its hash when read")
213
            }
2145858×
            None => TreeMaps::default(),
2159081×
        })
21648353555×
    }
217
218722091×
    fn m_mut(&mut self) -> &mut TreeMaps {
219722091×
        self.m();
220722091×
        self.maps.get_mut().expect("decoded just now")
221722091×
    }
222
223
    /// Apply tree op `index` of `change`; `OpRef` self references must already be resolved.
22439335×
    pub fn apply(&mut self, change: ChangeHash, index: u32, op: &TreeOp) {
22539335×
        let cached = self.view_cache.take();
226
        // Whether the placement or mode atom this op retires was live.
22739335×
        let was_live = match op {
228844×
            TreeOp::RemoveNode { placement, .. } => self.placement_live(&op_key(*placement)),
229162×
            TreeOp::Move { old, .. } => self.placement_live(&op_key(*old)),
23028×
            TreeOp::SetMode { old, .. } => self.mode_live(&op_key(*old)),
23138301×
            TreeOp::AddNode { .. } => false,
232
        };
23339335×
        self.apply_to_graph(change, index, op);
23439335×
        if let Some(mut c) = cached {
23512562×
            if self.update_view(&mut c, (change, index), op, was_live) {
2362741×
                #[cfg(test)]
2379579×
                assert_eq!(
2382741×
                    c.view,
2399579×
                    self.compute_view(),
2402741×
                    "view kept up to date by {op:?}"
2412741×
                );
24212320×
                self.view_cache = std::sync::OnceLock::from(c);
2432741×
            }
24426773×
        }
24539335×
    }
246
24739335×
    fn apply_to_graph(&mut self, change: ChangeHash, index: u32, op: &TreeOp) {
24839335×
        let key = (change, index);
24939335×
        match op {
250
            TreeOp::AddNode {
25138301×
                node,
25238301×
                kind,
25338301×
                mode,
25438301×
                parent,
25538301×
                name,
256
            } => {
25738301×
                self.m_mut().kinds.insert(*node, *kind);
25838301×
                self.m_mut().introduced.insert(*node, change);
25938301×
                self.m_mut().placements.insert(
26038301×
                    key,
26138301×
                    Placement {
26238301×
                        node: *node,
26338301×
                        parent: *parent,
26438301×
                        name: name.clone(),
26538301×
                    },
266
                );
26738301×
                self.m_mut()
26838301×
                    .placements_of
26938301×
                    .entry(*node)
27038301×
                    .or_default()
27138301×
                    .insert(key);
27238301×
                self.index_placement(key);
27338301×
                if *kind != NodeKind::Dir {
27436469×
                    self.m_mut().modes.insert(key, (*node, *mode));
27536469×
                    self.m_mut().modes_of.entry(*node).or_default().insert(key);
27636469×
                    self.index_mode(key);
27736469×
                }
278
            }
279844×
            TreeOp::RemoveNode { placement, .. } => {
280844×
                self.m_mut()
281844×
                    .deleted_placements
282844×
                    .entry(op_key(*placement))
283844×
                    .or_default()
284844×
                    .insert(change);
285844×
                self.index_placement(op_key(*placement));
286844×
            }
287
            TreeOp::Move {
288162×
                node,
289162×
                old,
290162×
                parent,
291162×
                name,
292162×
            } => {
293162×
                self.m_mut()
294162×
                    .deleted_placements
295162×
                    .entry(op_key(*old))
296162×
                    .or_default()
297162×
                    .insert(change);
298162×
                self.index_placement(op_key(*old));
299162×
                self.m_mut().placements.insert(
300162×
                    key,
301162×
                    Placement {
302162×
                        node: *node,
303162×
                        parent: *parent,
304162×
                        name: name.clone(),
305162×
                    },
306162×
                );
307162×
                self.m_mut()
308162×
                    .placements_of
309162×
                    .entry(*node)
310162×
                    .or_default()
311162×
                    .insert(key);
312162×
                self.index_placement(key);
313162×
            }
31428×
            TreeOp::SetMode { node, old, mode } => {
31528×
                self.m_mut()
31628×
                    .deleted_modes
31728×
                    .entry(op_key(*old))
31828×
                    .or_default()
31928×
                    .insert(change);
32028×
                self.index_mode(op_key(*old));
32128×
                self.m_mut().modes.insert(key, (*node, *mode));
32228×
                self.m_mut().modes_of.entry(*node).or_default().insert(key);
32328×
                self.index_mode(key);
32428×
            }
325
        }
32639335×
    }
327
328
    /// Bring the cached view `c` up to date with `op` (already applied as
329
    /// `key`) where that is simple and the view has no conflicts; false
330
    /// when it must be computed again. `was_live`: whether the placement or
331
    /// mode atom `op` retires was live before it.
33212562×
    fn update_view(&self, c: &mut CachedView, key: OpKey, op: &TreeOp, was_live: bool) -> bool {
33312562×
        if !c.view.conflicts.is_empty() {
33414×
            return false;
33512548×
        }
33612548×
        match op {
33712315×
            TreeOp::AddNode { node, .. } => self.view_add(c, *node, key),
338162×
            TreeOp::RemoveNode { node, placement } => {
339162×
                !was_live || self.view_remove(c, *node, op_key(*placement))
340
            }
34163×
            TreeOp::Move { node, old, .. } => {
34263×
                (!was_live || self.view_remove(c, *node, op_key(*old)))
34312×
                    && self.view_add(c, *node, key)
344
            }
3458×
            TreeOp::SetMode { node, .. } => {
3468×
                let live = self.live_placements(node);
3478×
                match live.as_slice() {
3488×
                    [] => true,
3495×
                    [(k, p)] => {
3505×
                        let Some(path) = c.dirs.get(&p.parent).map(|d| join(d, &p.name)) else {
3510×
                            return false;
352
                        };
3535×
                        let Some(mode) = self.entry_mode(node) else {
3540×
                            return false;
355
                        };
3565×
                        let entries = std::sync::Arc::make_mut(&mut c.view.entries);
3575×
                        match entries.get_mut(&path) {
3585×
                            Some(e) if e.node == *node && e.placement == *k => {
3595×
                                (e.mode_atom, e.mode) = mode;
3605×
                                true
361
                            }
3620×
                            _ => false,
363
                        }
364
                    }
3650×
                    _ => false,
366
                }
367
            }
368
        }
36912562×
    }
370
371
    /// The view entry for `node`'s placement `key`, just made live.
37212327×
    fn view_add(&self, c: &mut CachedView, node: NodeId, key: OpKey) -> bool {
37312327×
        if !self.placement_live(&key) {
3740×
            return true;
37512327×
        }
37612327×
        if self
37712327×
            .m()
37812327×
            .live_placements_of
37912327×
            .get(&node)
38012327×
            .is_none_or(|s| s.len() != 1)
381
        {
3827×
            return false;
38312320×
        }
38412320×
        let Some(p) = self.m().placements.get(&key) else {
3850×
            return false;
386
        };
38712320×
        let Some(path) = c.dirs.get(&p.parent).map(|d| join(d, &p.name)) else {
3881×
            return false;
389
        };
39012319×
        let Some((mode_atom, mode)) = self.entry_mode(&node) else {
3911×
            return false;
392
        };
39312318×
        let kind = self.kind(&node).unwrap_or(NodeKind::File);
39412318×
        let entries = std::sync::Arc::make_mut(&mut c.view.entries);
39512318×
        if entries.contains_key(&path) || node == NodeId::ROOT {
39673×
            return false;
39712245×
        }
398
        // Nothing can be placed under a directory that was not in the view
399
        // yet: it would have been an orphan, and the view had no conflicts.
40012245×
        if kind == NodeKind::Dir {
401833×
            c.dirs.insert(node, path.clone());
40211412×
        }
40312245×
        entries.insert(
40412245×
            path.clone(),
40512245×
            TreeEntry {
40612245×
                path,
40712245×
                node,
40812245×
                kind,
40912245×
                mode,
41012245×
                placement: key,
41112245×
                mode_atom,
41212245×
            },
413
        );
41412245×
        true
41512327×
    }
416
417
    /// Drop the view entry of `node`'s placement `key`, just retired.
418211×
    fn view_remove(&self, c: &mut CachedView, node: NodeId, key: OpKey) -> bool {
419211×
        if self.m().live_placements_of.contains_key(&node) {
42051×
            return false;
421160×
        }
422160×
        let Some(p) = self.m().placements.get(&key) else {
42368×
            return false;
424
        };
42592×
        let Some(path) = c.dirs.get(&p.parent).map(|d| join(d, &p.name)) else {
4260×
            return false;
427
        };
42892×
        let entries = std::sync::Arc::make_mut(&mut c.view.entries);
42992×
        match entries.get(&path) {
43092×
            Some(e) if e.node == node && e.placement == key => {}
4310×
            _ => return false,
432
        }
43392×
        if entries.get(&path).is_some_and(|e| e.kind == NodeKind::Dir) {
43428×
            let prefix = format!("{path}/");
43528×
            if entries
43628×
                .range(prefix.clone()..)
43728×
                .next()
43828×
                .is_some_and(|(k, _)| k.starts_with(&prefix))
439
            {
44027×
                return false;
4411×
            }
4421×
            c.dirs.remove(&node);
44364×
        }
44465×
        entries.remove(&path);
44565×
        true
446211×
    }
447
448
    /// The mode atom and mode of `node`'s entry, as `compute_view` finds
449
    /// them; `None` when its live modes conflict.
45012324×
    fn entry_mode(&self, node: &NodeId) -> Option<(Option<OpKey>, Mode)> {
45112324×
        let lm = self.live_modes(node);
45212324×
        let distinct: BTreeSet<Mode> = lm.iter().map(|(_, m)| *m).collect();
45312324×
        if distinct.len() > 1 {
4541×
            return None;
45512323×
        }
45612323×
        let mode_atom = lm.iter().map(|(k, _)| *k).max();
45712323×
        let mode = mode_atom
45812323×
            .and_then(|k| self.m().modes.get(&k).map(|(_, m)| *m))
45912323×
            .unwrap_or_default();
46012323×
        Some((mode_atom, mode))
46112324×
    }
462
463
    /// Bring placement `k` in the live index up to date.
46473042×
    fn index_placement(&mut self, k: OpKey) {
46573042×
        let Some(node) = self.m_mut().placements.get(&k).map(|p| p.node) else {
466308×
            return;
467
        };
46872734×
        if self.placement_live(&k) {
46971700×
            self.m_mut()
47071700×
                .live_placements_of
47171700×
                .entry(node)
47271700×
                .or_default()
47371700×
                .insert(k);
47471700×
        } else if let Some(set) = self.m_mut().live_placements_of.get_mut(&node) {
475650×
            set.remove(&k);
476650×
            if set.is_empty() {
477586×
                self.m_mut().live_placements_of.remove(&node);
478586×
            }
479384×
        }
48073042×
    }
481
482
    /// Bring mode atom `k` in the live index up to date.
48370022×
    fn index_mode(&mut self, k: OpKey) {
48470022×
        let Some(node) = self.m_mut().modes.get(&k).map(|(n, _)| *n) else {
48511×
            return;
486
        };
48770011×
        if self.mode_live(&k) {
48869982×
            self.m_mut()
48969982×
                .live_modes_of
49069982×
                .entry(node)
49169982×
                .or_default()
49269982×
                .insert(k);
49369982×
        } else if let Some(set) = self.m_mut().live_modes_of.get_mut(&node) {
49429×
            set.remove(&k);
49529×
            if set.is_empty() {
49610×
                self.m_mut().live_modes_of.remove(&node);
49719×
            }
4980×
        }
49970022×
    }
500
501
    /// Directories no longer placed anywhere, by the (parent, name) they
502
    /// were last placed at, with that placement: what an import can bring
503
    /// back rather than make a second node for one Git path.
50414×
    pub fn dead_dirs(&self) -> HashMap<(NodeId, String), (NodeId, OpKey)> {
50514×
        let mut out: HashMap<(NodeId, String), (NodeId, OpKey)> = HashMap::new();
50615×
        for (k, p) in &self.m().placements {
50715×
            if self.kind(&p.node) != Some(NodeKind::Dir)
5085×
                || self.placement_live(k)
5092×
                || !self.live_placements(&p.node).is_empty()
510
            {
51113×
                continue;
5122×
            }
5132×
            let slot = out
5142×
                .entry((p.parent, p.name.clone()))
5152×
                .or_insert((p.node, *k));
516
            // The newest placement, by key: the same answer in any order.
5172×
            if *k > slot.1 {
5180×
                *slot = (p.node, *k);
5192×
            }
520
        }
52114×
        out
52214×
    }
523
524
    /// Every placement `node` ever had, live or not, with the changes that
525
    /// retired it (none while live).
5260×
    pub fn placement_history(&self, node: &NodeId) -> Vec<(OpKey, &Placement, Vec<ChangeHash>)> {
5270×
        self.m()
5280×
            .placements_of
5290×
            .get(node)
5300×
            .into_iter()
5310×
            .flatten()
5320×
            .filter_map(|k| {
5330×
                let p = self.m().placements.get(k)?;
5340×
                let by = self
5350×
                    .m()
5360×
                    .deleted_placements
5370×
                    .get(k)
5380×
                    .map(|d| d.iter().copied().collect())
5390×
                    .unwrap_or_default();
5400×
                Some((*k, p, by))
5410×
            })
5420×
            .collect()
5430×
    }
544
54586072×
    fn placement_live(&self, k: &OpKey) -> bool {
54686072×
        self.m()
54786072×
            .deleted_placements
54886072×
            .get(k)
54986072×
            .is_none_or(|d| d.is_empty())
55086072×
    }
55170039×
    fn mode_live(&self, k: &OpKey) -> bool {
55270039×
        self.m().deleted_modes.get(k).is_none_or(|d| d.is_empty())
55370039×
    }
554
5556777245×
    pub fn kind(&self, node: &NodeId) -> Option<NodeKind> {
5566777245×
        if node.is_root() {
5570×
            Some(NodeKind::Dir)
558
        } else {
5596777245×
            self.m().kinds.get(node).copied()
560
        }
5616777245×
    }
562
563
    /// The change whose `AddNode` introduced `node`.
56415076×
    pub fn introducer(&self, node: &NodeId) -> Option<ChangeHash> {
56515076×
        if let (None, Some(raw)) = (self.maps.get(), &self.raw_introduced) {
566556×
            let only = self.introduced_only.get_or_init(|| {
56761×
                read_introduced(raw).expect("a state index is checked against its hash when read")
56861×
            });
569
            #[cfg(test)]
5700×
            assert_eq!(
5710×
                only.get(node),
5720×
                TreeMaps::decode(self.raw.as_ref().unwrap())
5730×
                    .unwrap()
5740×
                    .introduced
5750×
                    .get(node),
576
                "the introducers block is the maps'"
577
            );
578556×
            return only.get(node).copied();
57914520×
        }
58014520×
        self.m().introduced.get(node).copied()
58115076×
    }
582
583878×
    pub fn placement(&self, k: &OpKey) -> Option<&Placement> {
584878×
        self.m().placements.get(k)
585878×
    }
586
5876765143×
    pub fn live_placements(&self, node: &NodeId) -> Vec<(OpKey, &Placement)> {
5886765143×
        self.m()
5896765143×
            .live_placements_of
5906765143×
            .get(node)
5916765143×
            .into_iter()
5926765143×
            .flat_map(|ks| ks.iter())
5936765151×
            .filter_map(|k| self.m().placements.get(k).map(|p| (*k, p)))
5946765143×
            .collect()
5956765143×
    }
596
5976777227×
    pub fn live_modes(&self, node: &NodeId) -> Vec<(OpKey, Mode)> {
5986777227×
        self.m()
5996777227×
            .live_modes_of
6006777227×
            .get(node)
6016777227×
            .into_iter()
6026777227×
            .flat_map(|ks| ks.iter())
6036777227×
            .filter_map(|k| self.m().modes.get(k).map(|(_, m)| (*k, *m)))
6046777227×
            .collect()
6056777227×
    }
606
607
    /// Every node that has at least one live placement.
6080×
    pub fn placed_nodes(&self) -> impl Iterator<Item = NodeId> + '_ {
6090×
        self.m().live_placements_of.keys().copied()
6100×
    }
611
612
    /// Resolve the tree: assign paths, find conflicts.
613
    /// The materialized tree (spec §7.1): computed once per graph and
614
    /// cloned for each caller.
61510336×
    pub fn view(&self) -> TreeView {
61610336×
        self.view_cache
61710336×
            .get_or_init(|| CachedView::new(self.compute_view()))
618
            .view
61910336×
            .clone()
62010336×
    }
621
62213224×
    fn compute_view(&self) -> TreeView {
62313224×
        let mut view = TreeView::default();
62413224×
        let mut entries: BTreeMap<String, TreeEntry> = BTreeMap::new();
625
626
        // Live placements grouped by parent.
62713224×
        let mut children: HashMap<NodeId, Vec<(OpKey, &Placement)>> = HashMap::new();
6286764903×
        for ks in self.m().live_placements_of.values() {
6296764918×
            for k in ks {
6306764918×
                if let Some(p) = self.m().placements.get(k) {
6316764918×
                    children.entry(p.parent).or_default().push((*k, p));
6326764918×
                }
633
            }
634
        }
63520259×
        for c in children.values_mut() {
63674673730×
            c.sort_by(|a, b| a.1.name.cmp(&b.1.name).then(a.0.cmp(&b.0)));
637
        }
638
639
        // Multi-placement and mode conflicts.
640
        // Only placed nodes: one with no live placement is not in the tree.
64113224×
        let mut nodes: Vec<NodeId> = self.m().live_placements_of.keys().copied().collect();
64213224×
        nodes.sort();
64313224×
        let mut multi: HashSet<NodeId> = HashSet::new();
644
        // Each node's mode and the atom it comes from, for the entries.
64513224×
        let mut modes: HashMap<NodeId, (Option<OpKey>, Mode)> = HashMap::new();
6466764903×
        for n in &nodes {
6476764903×
            let lp = self.live_placements(n);
648
            // One placement (nearly every node) cannot be in two places.
6496764903×
            if lp.len() > 1 {
65015×
                let distinct_places: BTreeSet<(&NodeId, &str)> = lp
65115×
                    .iter()
65230×
                    .map(|(_, p)| (&p.parent, p.name.as_str()))
65315×
                    .collect();
65415×
                if distinct_places.len() > 1 {
6552×
                    multi.insert(*n);
6562×
                    view.conflicts.push(TreeConflict::MultiPlacement {
6572×
                        node: *n,
6582×
                        placements: lp.iter().map(|(k, _)| *k).collect(),
659
                    });
66013×
                }
6616764888×
            }
6626764903×
            let lm = self.live_modes(n);
6636764903×
            if lm.len() > 1 {
6642×
                let distinct_modes: BTreeSet<Mode> = lm.iter().map(|(_, m)| *m).collect();
6652×
                if distinct_modes.len() > 1 {
6661×
                    view.conflicts.push(TreeConflict::Mode {
6671×
                        node: *n,
6681×
                        modes: distinct_modes.into_iter().collect(),
6691×
                    });
6701×
                }
6716764901×
            }
6726764903×
            let mode_atom = lm.iter().map(|(k, _)| *k).max();
6736764903×
            let mode = mode_atom
6746764903×
                .and_then(|k| self.m().modes.get(&k).map(|(_, m)| *m))
6756764903×
                .unwrap_or_default();
6766764903×
            modes.insert(*n, (mode_atom, mode));
677
        }
678
679
        // BFS from the root, assigning paths.
68013224×
        let mut reached: HashSet<NodeId> = HashSet::new();
68113224×
        reached.insert(NodeId::ROOT);
68213224×
        let mut queue: Vec<(NodeId, String)> = vec![(NodeId::ROOT, String::new())];
68313224×
        let mut on_path: HashSet<NodeId> = HashSet::new();
68435535×
        while let Some((dir, dir_path)) = queue.pop() {
68522311×
            let Some(kids) = children.get(&dir) else {
6862057×
                continue;
687
            };
688
            // Name conflicts within this directory: the children are sorted
689
            // by name, so each name's group is a run of them.
69020254×
            let mut groups: Vec<(&str, &[(OpKey, &Placement)])> = Vec::new();
69120254×
            let mut start = 0;
6926764912×
            for i in 1..=kids.len() {
6936764912×
                if i == kids.len() || kids[i].1.name != kids[start].1.name {
6946764530×
                    groups.push((kids[start].1.name.as_str(), &kids[start..i]));
6956764530×
                    start = i;
6966764530×
                }
697
            }
6986764530×
            for (name, group) in groups {
6996764530×
                let distinct: BTreeSet<NodeId> = group.iter().map(|(_, p)| p.node).collect();
7006764530×
                if distinct.len() > 1 {
701343×
                    view.conflicts.push(TreeConflict::Name {
702343×
                        parent: dir,
703343×
                        name: name.to_string(),
704343×
                        nodes: distinct.iter().copied().collect(),
705343×
                    });
7066764187×
                }
7076764530×
                let suffixed = distinct.len() > 1;
7086764912×
                for (i, (k, p)) in group.iter().enumerate() {
7096764912×
                    let node = p.node;
7106764912×
                    if node == dir || on_path.contains(&node) {
7110×
                        view.conflicts.push(TreeConflict::Cycle { node });
7120×
                        continue;
7136764912×
                    }
7146764912×
                    let needs_suffix = suffixed || multi.contains(&node);
7156764912×
                    let leaf = if needs_suffix {
716715×
                        format!("{name}.oxy-conflict-{}", i + 1)
717
                    } else {
7186764197×
                        name.to_string()
719
                    };
7206764912×
                    let path = if dir_path.is_empty() {
72118610×
                        leaf
722
                    } else {
7236746302×
                        format!("{dir_path}/{leaf}")
724
                    };
7256764912×
                    let kind = self.kind(&node).unwrap_or(NodeKind::File);
7266764912×
                    let (mode_atom, mode) = modes.get(&node).copied().unwrap_or_default();
7276764912×
                    entries.insert(
7286764912×
                        path.clone(),
7296764912×
                        TreeEntry {
7306764912×
                            path: path.clone(),
7316764912×
                            node,
7326764912×
                            kind,
7336764912×
                            mode,
7346764912×
                            placement: *k,
7356764912×
                            mode_atom,
7366764912×
                        },
737
                    );
7386764912×
                    if kind == NodeKind::Dir && reached.insert(node) {
7399087×
                        on_path.insert(dir);
7409087×
                        queue.push((node, path));
7416755825×
                    } else {
7426755825×
                        reached.insert(node);
7436755825×
                    }
744
                }
745
            }
746
        }
747
748
        // Nodes with live placements that were never reached: orphans or cycles.
7496764903×
        for n in &nodes {
7506764903×
            if reached.contains(n) {
7516764898×
                continue;
7525×
            }
7535×
            let lp = self.live_placements(n);
7545×
            if lp.is_empty() {
7550×
                continue;
7565×
            }
7575×
            let mut seen = HashSet::new();
7585×
            let mut cur = *n;
7595×
            let conflict = loop {
76012×
                if !seen.insert(cur) {
7612×
                    break TreeConflict::Cycle { node: *n };
76210×
                }
76310×
                let lp = self.live_placements(&cur);
76410×
                let Some((_, p)) = lp.first() else {
7653×
                    break TreeConflict::Orphan {
7663×
                        node: *n,
7673×
                        parent: cur,
7683×
                    };
769
                };
7707×
                if reached.contains(&p.parent) {
771
                    // Parent reached but this node was not: the parent is not a
772
                    // directory, so this is a name/kind problem surfaced as orphan.
7730×
                    break TreeConflict::Orphan {
7740×
                        node: *n,
7750×
                        parent: p.parent,
7760×
                    };
7777×
                }
7787×
                cur = p.parent;
779
            };
7805×
            if !view.conflicts.contains(&conflict) {
7815×
                view.conflicts.push(conflict);
7825×
            }
783
        }
78413224×
        view.entries = std::sync::Arc::new(entries);
78513224×
        view
78613224×
    }
787
}
788
789
impl TreeGraph {
790
    /// `view` (this graph's) with each name conflict between nodes added
791
    /// with identical content made one entry (spec §9.2): the node whose
792
    /// placement there has the least key is shown at the plain name, and
793
    /// the others are listed in [`TreeView::unified`]. Only a group of
794
    /// files, symlinks or subrepos of one kind and mode, none in another
795
    /// conflict, is offered to `same`, one entry per node, which says
796
    /// whether their contents are identical (`None`: it cannot tell yet).
797
    /// The key order is the same for every peer, so all show one node.
798
    /// Also returns whether `same` answered for every group.
799329×
    pub fn unify(
800329×
        &self,
801329×
        mut view: TreeView,
802329×
        same: impl Fn(&[&TreeEntry]) -> Option<bool>,
803329×
    ) -> (TreeView, bool) {
804329×
        let mut decided = true;
805329×
        if !view
806329×
            .conflicts
807329×
            .iter()
808329×
            .any(|c| matches!(c, TreeConflict::Name { .. }))
809
        {
8100×
            return (view, decided);
811329×
        }
812
        // Nodes in any other conflict stay as they are.
813329×
        let mut troubled: HashSet<NodeId> = HashSet::new();
814337×
        for c in &view.conflicts {
815337×
            match c {
816337×
                TreeConflict::Name { .. } => {}
8170×
                TreeConflict::MultiPlacement { node, .. }
8180×
                | TreeConflict::Orphan { node, .. }
8190×
                | TreeConflict::Cycle { node }
8200×
                | TreeConflict::Mode { node, .. } => {
8210×
                    troubled.insert(*node);
8220×
                }
823
            }
824
        }
825329×
        let mut of_node: HashMap<NodeId, Vec<&TreeEntry>> = HashMap::new();
8261572×
        for e in view.entries.values() {
8271572×
            of_node.entry(e.node).or_default().push(e);
8281572×
        }
829
        // (paths to drop, entry to add, duplicates) per unified group.
830329×
        let mut merged: Vec<(Vec<String>, TreeEntry, Vec<NodeId>)> = Vec::new();
831329×
        let mut gone: HashSet<usize> = HashSet::new();
832337×
        for (i, c) in view.conflicts.iter().enumerate() {
833
            let TreeConflict::Name {
834337×
                parent,
835337×
                name,
836337×
                nodes,
837337×
            } = c
838
            else {
8390×
                continue;
840
            };
841700×
            if nodes.iter().any(|n| troubled.contains(n)) {
8420×
                continue;
843337×
            }
844
            // The group's entries: each node's placements at this place.
845337×
            let mut group: Vec<&TreeEntry> = Vec::new();
846700×
            for n in nodes {
847700×
                for e in of_node.get(n).into_iter().flatten() {
848700×
                    if self
849700×
                        .placement(&e.placement)
850700×
                        .is_some_and(|p| p.parent == *parent && p.name == *name)
851700×
                    {
852700×
                        group.push(e);
853700×
                    }
854
                }
855
            }
856337×
            let Some(first) = group.first() else {
8570×
                continue;
858
            };
859337×
            if first.kind == NodeKind::Dir
860336×
                || group
861336×
                    .iter()
862698×
                    .any(|e| e.kind != first.kind || e.mode != first.mode)
863
            {
8646×
                continue;
865331×
            }
866331×
            group.sort_by_key(|e| e.placement);
867331×
            let mut reps: Vec<&TreeEntry> = Vec::new();
868688×
            for e in &group {
869688×
                if !reps.iter().any(|r| r.node == e.node) {
870688×
                    reps.push(e);
871688×
                }
872
            }
873331×
            if reps.len() < 2 {
8740×
                continue;
875331×
            }
876331×
            match same(&reps) {
877200×
                Some(true) => {}
878130×
                Some(false) => continue,
879
                None => {
8801×
                    decided = false;
8811×
                    continue;
882
                }
883
            }
884200×
            let shown = reps[0];
885200×
            let path = match shown.path.rsplit_once('/') {
8861×
                Some((dir, _)) => format!("{dir}/{name}"),
887199×
                None => name.clone(),
888
            };
889200×
            merged.push((
890426×
                group.iter().map(|e| e.path.clone()).collect(),
891200×
                TreeEntry {
892200×
                    path,
893200×
                    ..shown.clone()
894200×
                },
895200×
                reps[1..].iter().map(|e| e.node).collect(),
896
            ));
897200×
            gone.insert(i);
898
        }
899329×
        drop(of_node);
900329×
        if merged.is_empty() {
901136×
            return (view, decided);
902193×
        }
903193×
        let entries = std::sync::Arc::make_mut(&mut view.entries);
904200×
        for (paths, shown, dups) in merged {
905426×
            for p in paths {
906426×
                entries.remove(&p);
907426×
            }
908226×
            for d in dups {
909226×
                view.unified.insert(d, shown.node);
910226×
            }
911200×
            entries.insert(shown.path.clone(), shown);
912
        }
913193×
        let mut i = 0;
914200×
        view.conflicts.retain(|_| {
915200×
            i += 1;
916200×
            !gone.contains(&(i - 1))
917200×
        });
918193×
        (view, decided)
919329×
    }
920
}
921
922
impl TreeGraph {
923
    /// Serialize for a checkpoint.
924400×
    pub fn to_value(&self) -> crate::cbor::Value {
925
        use crate::cbor::Value;
9264396×
        let opkey = |k: &OpKey| vec![Value::Bytes(k.0 .0.to_vec()), Value::Uint(k.1 as u64)];
927800×
        let deleters = |m: &Map<OpKey, BTreeSet<ChangeHash>>| {
928800×
            let mut ks: Vec<&OpKey> = m.keys().collect();
929800×
            ks.sort();
930
            Value::Array(
931800×
                ks.into_iter()
932800×
                    .map(|k| {
933356×
                        let mut v = opkey(k);
934356×
                        v.push(Value::Array(
935400×
                            m[k].iter().map(|d| Value::Bytes(d.0.to_vec())).collect(),
936
                        ));
937356×
                        Value::Array(v)
938356×
                    })
939800×
                    .collect(),
940
            )
941800×
        };
942400×
        let mut nodes: Vec<&NodeId> = self.m().kinds.keys().collect();
943400×
        nodes.sort();
944400×
        let mut pks: Vec<&OpKey> = self.m().placements.keys().collect();
945400×
        pks.sort();
946400×
        let mut mks: Vec<&OpKey> = self.m().modes.keys().collect();
947400×
        mks.sort();
948400×
        Value::map([
949
            (
950
                0,
951
                Value::Array(
952400×
                    nodes
953400×
                        .into_iter()
9542206×
                        .map(|n| {
9552206×
                            Value::Array(vec![
9562206×
                                Value::Bytes(n.0.to_vec()),
9572206×
                                Value::Uint(self.m().kinds[n].tag()),
9582206×
                                self.m()
9592206×
                                    .introduced
9602206×
                                    .get(n)
9612206×
                                    .map(|h| Value::Bytes(h.0.to_vec()))
9622206×
                                    .unwrap_or(Value::Null),
963
                            ])
9642206×
                        })
965400×
                        .collect(),
966
                ),
967
            ),
968
            (
969
                1,
970
                Value::Array(
971400×
                    pks.into_iter()
9722208×
                        .map(|k| {
9732208×
                            let p = &self.m().placements[k];
9742208×
                            let mut v = opkey(k);
9752208×
                            v.extend([
9762208×
                                Value::Bytes(p.node.0.to_vec()),
9772208×
                                Value::Bytes(p.parent.0.to_vec()),
9782208×
                                Value::Text(p.name.clone()),
9792208×
                            ]);
9802208×
                            Value::Array(v)
9812208×
                        })
982400×
                        .collect(),
983
                ),
984
            ),
985400×
            (2, deleters(&self.m().deleted_placements)),
986
            (
987
                3,
988
                Value::Array(
989400×
                    mks.into_iter()
9901832×
                        .map(|k| {
9911832×
                            let (n, m) = &self.m().modes[k];
9921832×
                            let mut v = opkey(k);
9931832×
                            v.extend([Value::Bytes(n.0.to_vec()), Value::Uint(m.bits())]);
9941832×
                            Value::Array(v)
9951832×
                        })
996400×
                        .collect(),
997
                ),
998
            ),
999400×
            (4, deleters(&self.m().deleted_modes)),
1000
        ])
1001400×
    }
1002
1003100×
    pub fn from_value(v: &crate::cbor::Value) -> Result<TreeGraph, crate::objects::ObjectError> {
1004
        use crate::objects::{array, bytes, field, map, oref, text, u32_, uint, ObjectError};
1005100×
        let m = map(v, "tree graph")?;
10061744×
        let node = |v: &crate::cbor::Value| {
10071744×
            NodeId::from_slice(bytes(v, "node")?)
10081744×
                .ok_or_else(|| ObjectError::Schema("node: expected 16 bytes".into()))
10091744×
        };
1010889×
        let opkey = |e: &[crate::cbor::Value]| -> Result<OpKey, ObjectError> {
1011889×
            Ok((oref(&e[0], "op change")?, u32_(&e[1], "op index")?))
1012889×
        };
1013100×
        let mut g = TreeGraph::default();
1014444×
        for n in array(field(m, 0, "nodes")?, "nodes")? {
1015444×
            let e = array(n, "node entry")?;
1016444×
            if e.len() != 3 {
10170×
                return Err(ObjectError::Schema("node entry: expected 3 fields".into()));
1018444×
            }
1019444×
            let id = node(&e[0])?;
1020444×
            g.m_mut()
1021444×
                .kinds
1022444×
                .insert(id, NodeKind::from_tag(uint(&e[1], "kind")?)?);
1023444×
            if !e[2].is_null() {
1024444×
                g.m_mut().introduced.insert(id, oref(&e[2], "introducer")?);
10250×
            }
1026
        }
1027445×
        for p in array(field(m, 1, "placements")?, "placements")? {
1028445×
            let e = array(p, "placement")?;
1029445×
            if e.len() != 5 {
10300×
                return Err(ObjectError::Schema("placement: expected 5 fields".into()));
1031445×
            }
1032445×
            let k = opkey(e)?;
1033445×
            let pl = Placement {
1034445×
                node: node(&e[2])?,
1035445×
                parent: node(&e[3])?,
1036445×
                name: text(&e[4], "name")?.to_owned(),
1037
            };
1038445×
            g.m_mut()
1039445×
                .placements_of
1040445×
                .entry(pl.node)
1041445×
                .or_default()
1042445×
                .insert(k);
1043445×
            g.m_mut().placements.insert(k, pl);
1044
        }
1045100×
        let deleters = |v: &crate::cbor::Value,
1046
                        what: &str|
1047200×
         -> Result<Map<OpKey, BTreeSet<ChangeHash>>, ObjectError> {
1048200×
            let mut out = Map::default();
1049200×
            for d in array(v, what)? {
105034×
                let e = array(d, what)?;
105134×
                if e.len() != 3 {
10520×
                    return Err(ObjectError::Schema(format!("{what}: expected 3 fields")));
105334×
                }
105434×
                out.insert(
105534×
                    opkey(e)?,
105634×
                    array(&e[2], "deleters")?
105734×
                        .iter()
105838×
                        .map(|x| oref(x, "deleter"))
105934×
                        .collect::<Result<BTreeSet<_>, _>>()?,
1060
                );
1061
            }
1062200×
            Ok(out)
1063200×
        };
1064100×
        g.m_mut().deleted_placements =
1065100×
            deleters(field(m, 2, "deleted placements")?, "deleted placement")?;
1066410×
        for md in array(field(m, 3, "modes")?, "modes")? {
1067410×
            let e = array(md, "mode")?;
1068410×
            if e.len() != 4 {
10690×
                return Err(ObjectError::Schema("mode: expected 4 fields".into()));
1070410×
            }
1071410×
            let k = opkey(e)?;
1072410×
            let n = node(&e[2])?;
1073410×
            g.m_mut()
1074410×
                .modes
1075410×
                .insert(k, (n, Mode::from_bits(uint(&e[3], "mode bits")?)?));
1076410×
            g.m_mut().modes_of.entry(n).or_default().insert(k);
1077
        }
1078100×
        g.m_mut().deleted_modes = deleters(field(m, 4, "deleted modes")?, "deleted mode")?;
1079100×
        let keys: Vec<OpKey> = g.m_mut().placements.keys().copied().collect();
1080445×
        for k in keys {
1081445×
            g.index_placement(k);
1082445×
        }
1083100×
        let keys: Vec<OpKey> = g.m_mut().modes.keys().copied().collect();
1084410×
        for k in keys {
1085410×
            g.index_mode(k);
1086410×
        }
1087100×
        Ok(g)
1088100×
    }
1089
}
1090
1091
/// The tree in the flat layout of a local index (oxygen#41), with its view
1092
/// when that has no conflicts, so a loaded tree need not work it out again.
1093
impl TreeGraph {
10941041×
    pub(crate) fn write_flat(&self, w: &mut crate::flat::Writer) {
1095131000×
        let key = |w: &mut crate::flat::Writer, k: &OpKey| {
1096131000×
            w.object(&k.0);
1097131000×
            w.u32(k.1);
1098131000×
        };
1099
        // The maps as a block of their own: a reader keeps it undecoded
1100
        // until something needs them.
11011041×
        let outer = std::mem::take(w);
11021041×
        let mut kinds: Vec<(&NodeId, &NodeKind)> = self.m().kinds.iter().collect();
11031041×
        kinds.sort_by_key(|(n, _)| **n);
11041041×
        w.count(kinds.len());
110532770×
        for (n, k) in kinds {
110632770×
            w.fixed(&n.0);
110732770×
            w.u8(k.tag() as u8);
110832770×
        }
11091041×
        let mut intro: Vec<(&NodeId, &ChangeHash)> = self.m().introduced.iter().collect();
11101041×
        intro.sort();
11111041×
        w.count(intro.len());
111232770×
        for (n, c) in intro {
111332770×
            w.fixed(&n.0);
111432770×
            w.object(c);
111532770×
        }
11161041×
        let mut pl: Vec<(&OpKey, &Placement)> = self.m().placements.iter().collect();
11171041×
        pl.sort_by_key(|(k, _)| **k);
11181041×
        w.count(pl.len());
111932770×
        for (k, p) in pl {
112032770×
            key(w, k);
112132770×
            w.fixed(&p.node.0);
112232770×
            w.fixed(&p.parent.0);
112332770×
            w.bytes(p.name.as_bytes());
112432770×
        }
11251041×
        let mut modes: Vec<(&OpKey, &(NodeId, Mode))> = self.m().modes.iter().collect();
11261041×
        modes.sort_by_key(|(k, _)| **k);
11271041×
        w.count(modes.len());
112832730×
        for (k, (n, m)) in modes {
112932730×
            key(w, k);
113032730×
            w.fixed(&n.0);
113132730×
            w.u8(m.bits() as u8);
113232730×
        }
11332082×
        for m in [&self.m().deleted_placements, &self.m().deleted_modes] {
11342082×
            let mut ks: Vec<(&OpKey, &BTreeSet<ChangeHash>)> = m.iter().collect();
11352082×
            ks.sort_by_key(|(k, _)| **k);
11362082×
            w.count(ks.len());
11372082×
            for (k, by) in ks {
11380×
                key(w, k);
11390×
                w.count(by.len());
11400×
                for c in by {
11410×
                    w.object(c);
11420×
                }
1143
            }
1144
        }
11451041×
        let maps = std::mem::replace(w, outer);
11461041×
        w.bytes(&maps.0);
1147
        // The introducers again, alone, for a reader that needs no more.
11481041×
        let mut iw = crate::flat::Writer::default();
11491041×
        let mut intro: Vec<(&NodeId, &ChangeHash)> = self.m().introduced.iter().collect();
11501041×
        intro.sort();
11511041×
        iw.count(intro.len());
115232770×
        for (n, c) in intro {
115332770×
            iw.fixed(&n.0);
115432770×
            iw.object(c);
115532770×
        }
11561041×
        w.bytes(&iw.0);
1157
        // The view as a block of its own.
11581041×
        let outer = std::mem::take(w);
11591041×
        let view = self.view();
11601041×
        if view.conflicts.is_empty() {
11611041×
            w.u8(1);
11621041×
            w.count(view.entries.len());
116332770×
            for (path, e) in view.entries.iter() {
116432770×
                w.bytes(path.as_bytes());
116532770×
                w.fixed(&e.node.0);
116632770×
                w.u8(e.kind.tag() as u8);
116732770×
                w.u8(e.mode.bits() as u8);
116832770×
                key(w, &e.placement);
116932770×
                match &e.mode_atom {
117040×
                    None => w.u8(0),
117132730×
                    Some(k) => {
117232730×
                        w.u8(1);
117332730×
                        key(w, k);
117432730×
                    }
1175
                }
1176
            }
11770×
        } else {
11780×
            w.u8(0);
11790×
        }
11801041×
        let view_bytes = std::mem::replace(w, outer);
11811041×
        w.bytes(&view_bytes.0);
11821041×
    }
1183
11842034×
    pub(crate) fn read_flat(
11852034×
        r: &mut crate::flat::Reader,
11862034×
    ) -> Result<TreeGraph, crate::objects::ObjectError> {
11872034×
        let maps = r.bytes()?;
11882034×
        let introduced = r.bytes()?;
11892034×
        let view = Self::read_view(r.bytes()?)?;
11902034×
        let mut g = TreeGraph {
11912034×
            raw: Some(std::sync::Arc::new(maps.to_vec())),
11922034×
            raw_introduced: Some(std::sync::Arc::new(introduced.to_vec())),
11932034×
            ..TreeGraph::default()
11942034×
        };
11952034×
        if let Some(view) = view {
1196784×
            // Checked on a copy, so the graph itself stays undecoded.
1197784×
            #[cfg(test)]
11981250×
            assert_eq!(
1199784×
                view,
12001250×
                TreeGraph {
12011250×
                    raw: g.raw.clone(),
12021250×
                    ..TreeGraph::default()
12031250×
                }
12041250×
                .compute_view(),
1205784×
                "an index's view is the tree's"
1206784×
            );
12072034×
            g.view_cache = std::sync::OnceLock::from(CachedView::new(view));
1208784×
        }
12092034×
        Ok(g)
12102034×
    }
1211
}
1212
1213
impl TreeMaps {
1214
    /// The maps block of a tree's flat form.
12153223×
    fn decode(bytes: &[u8]) -> Result<TreeMaps, crate::objects::ObjectError> {
1216
        use crate::objects::ObjectError;
12173223×
        let _t = crate::timing::phase("index: tree maps");
1218165599×
        let node = |r: &mut crate::flat::Reader| -> Result<NodeId, ObjectError> {
1219165599×
            Ok(NodeId(r.fixed::<16>()?))
1220165599×
        };
122166215×
        let key = |r: &mut crate::flat::Reader| -> Result<OpKey, ObjectError> {
122266215×
            Ok((r.object()?, r.u32()?))
122366215×
        };
12243223×
        let r = &mut crate::flat::Reader::new(bytes);
12253223×
        let mut g = TreeGraph::new();
12263223×
        for _ in 0..r.count()? {
122733128×
            let n = node(r)?;
122833128×
            g.m_mut()
122933128×
                .kinds
123033128×
                .insert(n, NodeKind::from_tag(r.u8()? as u64)?);
1231
        }
12323223×
        for _ in 0..r.count()? {
123333128×
            let n = node(r)?;
123433128×
            g.m_mut().introduced.insert(n, r.object()?);
1235
        }
12363223×
        for _ in 0..r.count()? {
123733128×
            let k = key(r)?;
123833128×
            let p = Placement {
123933128×
                node: node(r)?,
124033128×
                parent: node(r)?,
124133128×
                name: r.text()?,
1242
            };
124333128×
            g.m_mut().placements_of.entry(p.node).or_default().insert(k);
124433128×
            g.m_mut().placements.insert(k, p);
1245
        }
12463223×
        for _ in 0..r.count()? {
124733087×
            let k = key(r)?;
124833087×
            let n = node(r)?;
124933087×
            g.m_mut()
125033087×
                .modes
125133087×
                .insert(k, (n, Mode::from_bits(r.u8()? as u64)?));
125233087×
            g.m_mut().modes_of.entry(n).or_default().insert(k);
1253
        }
12546446×
        for i in 0..2 {
12556446×
            let mut m: Map<OpKey, BTreeSet<ChangeHash>> = Map::default();
12566446×
            for _ in 0..r.count()? {
12570×
                let k = key(r)?;
12580×
                let mut by = BTreeSet::new();
12590×
                for _ in 0..r.count()? {
12600×
                    by.insert(r.object()?);
1261
                }
12620×
                m.insert(k, by);
1263
            }
12646446×
            if i == 0 {
12653223×
                g.m_mut().deleted_placements = m;
12663223×
            } else {
12673223×
                g.m_mut().deleted_modes = m;
12683223×
            }
1269
        }
12703223×
        if !r.at_end() {
12710×
            return Err(ObjectError::Schema("state index: tree maps".into()));
12723223×
        }
12733223×
        let keys: Vec<OpKey> = g.m().placements.keys().copied().collect();
127433128×
        for k in keys {
127533128×
            g.index_placement(k);
127633128×
        }
12773223×
        let keys: Vec<OpKey> = g.m().modes.keys().copied().collect();
127833087×
        for k in keys {
127933087×
            g.index_mode(k);
128033087×
        }
12813223×
        Ok(g.maps.into_inner().unwrap_or_default())
12823223×
    }
1283
}
1284
1285
impl TreeGraph {
1286
    /// The view block of a tree's flat form, when it holds one.
12872034×
    fn read_view(bytes: &[u8]) -> Result<Option<TreeView>, crate::objects::ObjectError> {
12882034×
        let _t = crate::timing::phase("index: view");
12892034×
        let mut r = crate::flat::Reader::new(bytes);
12902034×
        if r.u8()? != 1 {
12910×
            return Ok(None);
12922034×
        }
129333413×
        let key = |r: &mut crate::flat::Reader| -> Result<OpKey, crate::objects::ObjectError> {
129433413×
            Ok((r.object()?, r.u32()?))
129533413×
        };
12962034×
        let n = r.count()?;
1297
        // Collected, then built in one step: the map is made from sorted
1298
        // input in a single pass rather than by searching for each insert.
12992034×
        let mut entries = Vec::with_capacity(n);
13002034×
        for _ in 0..n {
130116717×
            let path = r.text()?;
130216717×
            let e = TreeEntry {
130316717×
                path: path.clone(),
130416717×
                node: NodeId(r.fixed::<16>()?),
130516717×
                kind: NodeKind::from_tag(r.u8()? as u64)?,
130616717×
                mode: Mode::from_bits(r.u8()? as u64)?,
130716717×
                placement: key(&mut r)?,
130816717×
                mode_atom: match r.u8()? {
130921×
                    0 => None,
131016696×
                    _ => Some(key(&mut r)?),
1311
                },
1312
            };
131316717×
            entries.push((path, e));
1314
        }
13152034×
        Ok(Some(TreeView {
13162034×
            entries: std::sync::Arc::new(entries.into_iter().collect()),
13172034×
            conflicts: Vec::new(),
13182034×
            unified: BTreeMap::new(),
13192034×
        }))
13202034×
    }
1321
}
1322
1323
/// The introducers block of a tree's flat form.
132461×
fn read_introduced(bytes: &[u8]) -> Result<Map<NodeId, ChangeHash>, crate::objects::ObjectError> {
132561×
    let r = &mut crate::flat::Reader::new(bytes);
132661×
    let n = r.count()?;
132761×
    let mut m = Map::default();
132861×
    m.reserve(n);
132961×
    for _ in 0..n {
13300×
        let node = NodeId(r.fixed::<16>()?);
13310×
        m.insert(node, r.object()?);
1332
    }
133361×
    Ok(m)
133461×
}
1335
133612416×
fn join(dir: &str, name: &str) -> String {
133712416×
    if dir.is_empty() {
13384441×
        name.to_string()
1339
    } else {
13407975×
        format!("{dir}/{name}")
1341
    }
134212416×
}
1343
13443313×
pub fn op_key(r: OpRef) -> OpKey {
13453313×
    (r.change, r.index)
13463313×
}
1347
1348
#[cfg(test)]
1349
mod tests {
1350
    use super::*;
1351
    use crate::hash::ObjectRef;
1352
135362×
    fn h(n: u8) -> ChangeHash {
135462×
        ObjectRef([n; 32])
135562×
    }
135663×
    fn nid(n: u8) -> NodeId {
135763×
        NodeId([n; 16])
135863×
    }
135921×
    fn add(g: &mut TreeGraph, c: u8, i: u32, node: u8, kind: NodeKind, parent: NodeId, name: &str) {
136021×
        g.apply(
136121×
            h(c),
136221×
            i,
136321×
            &TreeOp::AddNode {
136421×
                node: nid(node),
136521×
                kind,
136621×
                mode: Mode::TEXT,
136721×
                parent,
136821×
                name: name.into(),
136921×
            },
1370
        );
137121×
    }
13728×
    fn paths(v: &TreeView) -> Vec<String> {
13738×
        v.entries.keys().cloned().collect()
13748×
    }
1375
1376
    /// Each op applied to a graph whose view is cached keeps it up to date
1377
    /// or drops it: `apply` checks every kept view against a full one.
1378
    #[test]
13791×
    fn cached_view_follows_ops() {
13801×
        let at = |c: u8, i: u32| OpRef {
13814×
            change: h(c),
13824×
            index: i,
13834×
        };
13841×
        let mut g = TreeGraph::new();
13851×
        let ops = [
13861×
            TreeOp::AddNode {
13871×
                node: nid(1),
13881×
                kind: NodeKind::Dir,
13891×
                mode: Mode::TEXT,
13901×
                parent: NodeId::ROOT,
13911×
                name: "src".into(),
13921×
            },
13931×
            TreeOp::AddNode {
13941×
                node: nid(2),
13951×
                kind: NodeKind::File,
13961×
                mode: Mode::TEXT,
13971×
                parent: nid(1),
13981×
                name: "a.rs".into(),
13991×
            },
14001×
            TreeOp::SetMode {
14011×
                node: nid(2),
14021×
                old: at(1, 1),
14031×
                mode: Mode {
14041×
                    exec: true,
14051×
                    opaque: false,
14061×
                },
14071×
            },
14081×
            TreeOp::Move {
14091×
                node: nid(2),
14101×
                old: at(1, 1),
14111×
                parent: NodeId::ROOT,
14121×
                name: "b.rs".into(),
14131×
            },
14141×
            // Moving an empty directory, then removing it.
14151×
            TreeOp::Move {
14161×
                node: nid(1),
14171×
                old: at(1, 0),
14181×
                parent: NodeId::ROOT,
14191×
                name: "lib".into(),
14201×
            },
14211×
            TreeOp::RemoveNode {
14221×
                node: nid(1),
14231×
                placement: at(1, 4),
14241×
            },
14251×
            // A name taken twice: a conflict, so the view is computed again.
14261×
            TreeOp::AddNode {
14271×
                node: nid(3),
14281×
                kind: NodeKind::File,
14291×
                mode: Mode::TEXT,
14301×
                parent: NodeId::ROOT,
14311×
                name: "b.rs".into(),
14321×
            },
14331×
        ];
14347×
        for (i, op) in ops.iter().enumerate() {
14357×
            let _ = g.view();
14367×
            g.apply(h(1), i as u32, op);
14377×
            assert_eq!(g.view(), g.compute_view());
1438
        }
14391×
        let v = g.view();
14401×
        assert_eq!(paths(&v), ["b.rs.oxy-conflict-1", "b.rs.oxy-conflict-2"]);
14411×
        assert!(v.entries.values().any(|e| e.mode.exec));
14421×
    }
1443
1444
    #[test]
14451×
    fn nested_paths_and_rename() {
14461×
        let mut g = TreeGraph::new();
14471×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "src");
14481×
        add(&mut g, 1, 1, 2, NodeKind::File, nid(1), "main.rs");
14491×
        add(&mut g, 1, 2, 3, NodeKind::File, NodeId::ROOT, "README");
14501×
        let v = g.view();
14511×
        assert_eq!(paths(&v), ["README", "src", "src/main.rs"]);
14521×
        assert!(!v.is_conflicted());
1453
1454
        // Rename src/main.rs → src/lib.rs, move src → lib (subtree follows).
14551×
        g.apply(
14561×
            h(2),
1457
            0,
14581×
            &TreeOp::Move {
14591×
                node: nid(2),
14601×
                old: OpRef {
14611×
                    change: h(1),
14621×
                    index: 1,
14631×
                },
14641×
                parent: nid(1),
14651×
                name: "lib.rs".into(),
14661×
            },
1467
        );
14681×
        g.apply(
14691×
            h(2),
1470
            1,
14711×
            &TreeOp::Move {
14721×
                node: nid(1),
14731×
                old: OpRef {
14741×
                    change: h(1),
14751×
                    index: 0,
14761×
                },
14771×
                parent: NodeId::ROOT,
14781×
                name: "lib".into(),
14791×
            },
1480
        );
14811×
        let v = g.view();
14821×
        assert_eq!(paths(&v), ["README", "lib", "lib/lib.rs"]);
14831×
        assert_eq!(v.entries["lib/lib.rs"].placement, (h(2), 0));
1484
14851×
        g.apply(
14861×
            h(3),
1487
            0,
14881×
            &TreeOp::RemoveNode {
14891×
                node: nid(3),
14901×
                placement: OpRef {
14911×
                    change: h(1),
14921×
                    index: 2,
14931×
                },
14941×
            },
1495
        );
14961×
        assert_eq!(paths(&g.view()), ["lib", "lib/lib.rs"]);
14971×
    }
1498
1499
    #[test]
15001×
    fn name_conflict_gets_suffixes() {
15011×
        let mut g = TreeGraph::new();
15021×
        add(&mut g, 1, 0, 1, NodeKind::File, NodeId::ROOT, "a.txt");
15031×
        add(&mut g, 2, 0, 2, NodeKind::File, NodeId::ROOT, "a.txt");
15041×
        let v = g.view();
15051×
        assert_eq!(paths(&v), ["a.txt.oxy-conflict-1", "a.txt.oxy-conflict-2"]);
15061×
        assert_eq!(
1507
            v.conflicts,
15081×
            vec![TreeConflict::Name {
15091×
                parent: NodeId::ROOT,
15101×
                name: "a.txt".into(),
15111×
                nodes: vec![nid(1), nid(2)]
15121×
            }]
1513
        );
15141×
    }
1515
1516
    /// Identical additions at one place are one entry, the node with the
1517
    /// least placement key shown; anything else stays a name conflict.
1518
    #[test]
15191×
    fn identical_additions_unify() {
15201×
        let mut g = TreeGraph::new();
15211×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "d");
15221×
        add(&mut g, 3, 0, 3, NodeKind::File, nid(1), "a.txt");
15231×
        add(&mut g, 2, 0, 2, NodeKind::File, nid(1), "a.txt");
15241×
        let raw = g.view();
15251×
        let (v, decided) = g.unify(raw.clone(), |es| {
15261×
            assert_eq!(es.len(), 2, "one entry per node");
15271×
            Some(true)
15281×
        });
15291×
        assert!(decided);
15301×
        assert_eq!(paths(&v), ["d", "d/a.txt"]);
15311×
        assert!(v.conflicts.is_empty());
15321×
        assert_eq!(v.entries["d/a.txt"].node, nid(2), "the least placement key");
15331×
        assert_eq!(v.entries["d/a.txt"].placement, (h(2), 0));
15341×
        assert_eq!(v.unified, [(nid(3), nid(2))].into_iter().collect());
1535
        // Different contents, or not known yet: the conflict as it was.
15361×
        let (v, decided) = g.unify(raw.clone(), |_| Some(false));
15371×
        assert!(decided);
15381×
        assert_eq!(v, raw);
15391×
        let (v, decided) = g.unify(raw.clone(), |_| None);
15401×
        assert!(!decided);
15411×
        assert_eq!(v, raw);
1542
        // Directories, and kinds that differ, are never offered.
15431×
        let mut g = TreeGraph::new();
15441×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "d");
15451×
        add(&mut g, 2, 0, 2, NodeKind::Dir, NodeId::ROOT, "d");
15461×
        add(&mut g, 3, 0, 3, NodeKind::File, NodeId::ROOT, "f");
15471×
        add(&mut g, 4, 0, 4, NodeKind::Symlink, NodeId::ROOT, "f");
15481×
        let raw = g.view();
15491×
        let (v, _) = g.unify(raw.clone(), |_| panic!("not offered"));
15501×
        assert_eq!(v, raw);
15511×
    }
1552
1553
    #[test]
15541×
    fn concurrent_renames_are_multi_placement() {
15551×
        let mut g = TreeGraph::new();
15561×
        add(&mut g, 1, 0, 1, NodeKind::File, NodeId::ROOT, "a");
15571×
        g.apply(
15581×
            h(2),
1559
            0,
15601×
            &TreeOp::Move {
15611×
                node: nid(1),
15621×
                old: OpRef {
15631×
                    change: h(1),
15641×
                    index: 0,
15651×
                },
15661×
                parent: NodeId::ROOT,
15671×
                name: "b".into(),
15681×
            },
1569
        );
15701×
        g.apply(
15711×
            h(3),
1572
            0,
15731×
            &TreeOp::Move {
15741×
                node: nid(1),
15751×
                old: OpRef {
15761×
                    change: h(1),
15771×
                    index: 0,
15781×
                },
15791×
                parent: NodeId::ROOT,
15801×
                name: "c".into(),
15811×
            },
1582
        );
15831×
        let v = g.view();
15841×
        assert_eq!(paths(&v), ["b.oxy-conflict-1", "c.oxy-conflict-1"]);
15851×
        assert!(
15861×
            matches!(v.conflicts[0], TreeConflict::MultiPlacement { node, .. } if node == nid(1))
1587
        );
15881×
    }
1589
1590
    #[test]
15911×
    fn orphan_and_cycle() {
15921×
        let mut g = TreeGraph::new();
15931×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "d");
15941×
        add(&mut g, 1, 1, 2, NodeKind::File, nid(1), "f");
1595
        // Concurrently: 2 removes d, 3 adds d/g.
15961×
        g.apply(
15971×
            h(2),
1598
            0,
15991×
            &TreeOp::RemoveNode {
16001×
                node: nid(1),
16011×
                placement: OpRef {
16021×
                    change: h(1),
16031×
                    index: 0,
16041×
                },
16051×
            },
1606
        );
16071×
        add(&mut g, 3, 0, 3, NodeKind::File, nid(1), "g");
16081×
        let v = g.view();
16091×
        assert_eq!(paths(&v), Vec::<String>::new());
16101×
        assert!(v.conflicts.contains(&TreeConflict::Orphan {
16111×
            node: nid(2),
16121×
            parent: nid(1)
16131×
        }));
16141×
        assert!(v.conflicts.contains(&TreeConflict::Orphan {
16151×
            node: nid(3),
16161×
            parent: nid(1)
16171×
        }));
1618
1619
        // Cycle: a/b, then concurrently move a under b and b under a's parent... simplest: move a into b.
16201×
        let mut g = TreeGraph::new();
16211×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "a");
16221×
        add(&mut g, 1, 1, 2, NodeKind::Dir, nid(1), "b");
16231×
        g.apply(
16241×
            h(2),
1625
            0,
16261×
            &TreeOp::Move {
16271×
                node: nid(1),
16281×
                old: OpRef {
16291×
                    change: h(1),
16301×
                    index: 0,
16311×
                },
16321×
                parent: nid(2),
16331×
                name: "a".into(),
16341×
            },
1635
        );
16361×
        let v = g.view();
16371×
        assert!(
16381×
            v.conflicts
16391×
                .iter()
16401×
                .any(|c| matches!(c, TreeConflict::Cycle { .. })),
1641
            "{:?}",
1642
            v.conflicts
1643
        );
16441×
    }
1645
1646
    #[test]
16471×
    fn serialization_round_trip() {
16481×
        let mut g = TreeGraph::new();
16491×
        add(&mut g, 1, 0, 1, NodeKind::Dir, NodeId::ROOT, "src");
16501×
        add(&mut g, 1, 1, 2, NodeKind::File, nid(1), "main.rs");
16511×
        g.apply(
16521×
            h(2),
1653
            0,
16541×
            &TreeOp::Move {
16551×
                node: nid(2),
16561×
                old: OpRef {
16571×
                    change: h(1),
16581×
                    index: 1,
16591×
                },
16601×
                parent: nid(1),
16611×
                name: "lib.rs".into(),
16621×
            },
1663
        );
16641×
        g.apply(
16651×
            h(3),
1666
            0,
16671×
            &TreeOp::SetMode {
16681×
                node: nid(2),
16691×
                old: OpRef {
16701×
                    change: h(1),
16711×
                    index: 1,
16721×
                },
16731×
                mode: Mode {
16741×
                    exec: true,
16751×
                    opaque: false,
16761×
                },
16771×
            },
1678
        );
16791×
        let bytes = crate::cbor::encode(&g.to_value());
16801×
        let back = TreeGraph::from_value(&crate::cbor::decode(&bytes).unwrap()).unwrap();
16811×
        assert_eq!(back.view(), g.view());
16821×
        assert_eq!(back.introducer(&nid(2)), Some(h(1)));
16831×
        assert_eq!(crate::cbor::encode(&back.to_value()), bytes);
16841×
    }
1685
1686
    #[test]
16871×
    fn mode_conflict_and_resolution() {
16881×
        let mut g = TreeGraph::new();
16891×
        add(&mut g, 1, 0, 1, NodeKind::File, NodeId::ROOT, "run.sh");
16901×
        g.apply(
16911×
            h(2),
1692
            0,
16931×
            &TreeOp::SetMode {
16941×
                node: nid(1),
16951×
                old: OpRef {
16961×
                    change: h(1),
16971×
                    index: 0,
16981×
                },
16991×
                mode: Mode {
17001×
                    exec: true,
17011×
                    opaque: false,
17021×
                },
17031×
            },
1704
        );
17051×
        g.apply(
17061×
            h(3),
1707
            0,
17081×
            &TreeOp::SetMode {
17091×
                node: nid(1),
17101×
                old: OpRef {
17111×
                    change: h(1),
17121×
                    index: 0,
17131×
                },
17141×
                mode: Mode {
17151×
                    exec: false,
17161×
                    opaque: true,
17171×
                },
17181×
            },
1719
        );
17201×
        let v = g.view();
17211×
        assert!(matches!(v.conflicts[0], TreeConflict::Mode { .. }));
1722
        // Materialized with the greatest mode atom.
17231×
        assert_eq!(
17241×
            v.entries["run.sh"].mode,
1725
            Mode {
1726
                exec: false,
1727
                opaque: true
1728
            }
1729
        );
1730
        // The placement introduced by the same AddNode is unaffected.
17311×
        assert_eq!(v.entries["run.sh"].placement, (h(1), 0));
1732
        // Resolution: retire both live mode atoms; identical live values do not conflict.
17331×
        g.apply(
17341×
            h(4),
1735
            0,
17361×
            &TreeOp::SetMode {
17371×
                node: nid(1),
17381×
                old: OpRef {
17391×
                    change: h(2),
17401×
                    index: 0,
17411×
                },
17421×
                mode: Mode {
17431×
                    exec: true,
17441×
                    opaque: false,
17451×
                },
17461×
            },
1747
        );
17481×
        g.apply(
17491×
            h(4),
1750
            1,
17511×
            &TreeOp::SetMode {
17521×
                node: nid(1),
17531×
                old: OpRef {
17541×
                    change: h(3),
17551×
                    index: 0,
17561×
                },
17571×
                mode: Mode {
17581×
                    exec: true,
17591×
                    opaque: false,
17601×
                },
17611×
            },
1762
        );
17631×
        let v = g.view();
17641×
        assert!(!v.is_conflicted(), "{:?}", v.conflicts);
17651×
        assert_eq!(
17661×
            v.entries["run.sh"].mode,
1767
            Mode {
1768
                exec: true,
1769
                opaque: false
1770
            }
1771
        );
17721×
    }
1773
}