| 1 | |
|
| 2 | |
|
| 3 | |
|
| 4 | | use crate::cbor::{self, Value}; |
| 5 | | use crate::graph::{AtomKey, DepOracle, FileGraph, Materialized, Vertex}; |
| 6 | | use crate::hash::KeyId; |
| 7 | | use crate::hash::{ChangeHash, ObjectRef}; |
| 8 | | use crate::ids::NodeId; |
| 9 | | use crate::objects::{ |
| 10 | | self as o, AtomRef, Change, ChangeKind, Edit, Hlc, Mode, NodeKind, ObjectError, TreeOp, |
| 11 | | }; |
| 12 | | use crate::tree::{TreeGraph, TreeView}; |
| 13 | | use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet}; |
| 14 | | use std::sync::Arc; |
| 15 | |
|
| 16 | |
|
| 17 | | pub const CHECKPOINT_INDEX_VERSION: u64 = 2; |
| 18 | |
|
| 19 | |
|
| 20 | | pub const INLINE_GRAPH_LIMIT: usize = 2048; |
| 21 | |
|
| 22 | | #[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)] |
| 23 | | pub enum StateError { |
| 24 | | #[error("change {1} depends on {0}, which is not in the state")] |
| 25 | | MissingDep(ChangeHash, ChangeHash), |
| 26 | | } |
| 27 | |
|
| 28 | |
|
| 29 | | type ReplaceRecord = (ChangeHash, Option<ObjectRef>, Option<ObjectRef>); |
| 30 | |
|
| 31 | |
|
| 32 | |
|
| 33 | | #[derive(Clone, Debug, PartialEq, Eq)] |
| 34 | | pub struct ChangeMeta { |
| 35 | | pub change_id: crate::ids::ChangeId, |
| 36 | | pub deps: Vec<ChangeHash>, |
| 37 | | pub author: KeyId, |
| 38 | | pub hlc: Hlc, |
| 39 | | pub message: String, |
| 40 | | pub kind: ChangeKind, |
| 41 | | } |
| 42 | |
|
| 43 | |
|
| 44 | |
|
| 45 | 1126× | pub fn log_order(a: (&ChangeHash, &Hlc), b: (&ChangeHash, &Hlc)) -> std::cmp::Ordering { |
| 46 | 1126× | b.1.cmp(a.1).then(b.0.cmp(a.0)) |
| 47 | 1126× | } |
| 48 | |
|
| 49 | | impl ChangeMeta { |
| 50 | | |
| 51 | 6552× | pub(crate) fn write_flat(&self, w: &mut crate::flat::Writer) { |
| 52 | 6552× | w.fixed(&self.change_id.0); |
| 53 | 6552× | w.count(self.deps.len()); |
| 54 | 6552× | for d in &self.deps { |
| 55 | 6027× | w.object(d); |
| 56 | 6027× | } |
| 57 | 6552× | w.object(&self.author); |
| 58 | 6552× | w.u64(self.hlc.wall_ms); |
| 59 | 6552× | w.u32(self.hlc.logical); |
| 60 | 6552× | w.bytes(self.message.as_bytes()); |
| 61 | 6552× | w.u8(self.kind.tag() as u8); |
| 62 | 6552× | } |
| 63 | |
|
| 64 | 11671× | pub(crate) fn read_flat(r: &mut crate::flat::Reader) -> Result<ChangeMeta, ObjectError> { |
| 65 | 11671× | let change_id = crate::ids::ChangeId(r.fixed::<16>()?); |
| 66 | 11671× | let mut deps = Vec::new(); |
| 67 | 11671× | for _ in 0..r.count()? { |
| 68 | 10761× | deps.push(r.object()?); |
| 69 | | } |
| 70 | | Ok(ChangeMeta { |
| 71 | 11671× | change_id, |
| 72 | 11671× | deps, |
| 73 | 11671× | author: r.object()?, |
| 74 | | hlc: Hlc { |
| 75 | 11671× | wall_ms: r.u64()?, |
| 76 | 11671× | logical: r.u32()?, |
| 77 | | }, |
| 78 | 11671× | message: r.text()?, |
| 79 | 11671× | kind: ChangeKind::from_tag(r.u8()? as u64)?, |
| 80 | | }) |
| 81 | 11671× | } |
| 82 | |
|
| 83 | 16998× | pub fn of(c: &Change) -> ChangeMeta { |
| 84 | 16998× | ChangeMeta { |
| 85 | 16998× | change_id: c.change_id, |
| 86 | 16998× | deps: c.deps.clone(), |
| 87 | 16998× | author: c.author, |
| 88 | 16998× | hlc: c.hlc, |
| 89 | 16998× | message: c.message.clone(), |
| 90 | 16998× | kind: c.kind, |
| 91 | 16998× | } |
| 92 | 16998× | } |
| 93 | | } |
| 94 | |
|
| 95 | | #[derive(Default)] |
| 96 | | pub struct State { |
| 97 | | |
| 98 | | |
| 99 | | changes: crate::fasthash::FastMap<ChangeHash, Arc<ChangeMeta>>, |
| 100 | | tree: TreeGraph, |
| 101 | | |
| 102 | | |
| 103 | | |
| 104 | | files: crate::fasthash::FastMap<NodeId, Arc<FileGraph>>, |
| 105 | | replaces: HashMap<NodeId, Vec<ReplaceRecord>>, |
| 106 | | |
| 107 | | |
| 108 | | |
| 109 | | |
| 110 | | |
| 111 | | closure: std::sync::RwLock<ClosureMemo>, |
| 112 | | |
| 113 | | |
| 114 | | |
| 115 | | levels: std::sync::RwLock<crate::fasthash::FastMap<ChangeHash, u32>>, |
| 116 | | |
| 117 | | |
| 118 | | |
| 119 | | deferred: Option<crate::fasthash::FastMap<NodeId, Arc<Deferred>>>, |
| 120 | | |
| 121 | | |
| 122 | | unified_view: std::sync::OnceLock<TreeView>, |
| 123 | | } |
| 124 | |
|
| 125 | | use crate::objects::TextRef; |
| 126 | |
|
| 127 | |
|
| 128 | |
|
| 129 | |
|
| 130 | |
|
| 131 | |
|
| 132 | |
|
| 133 | |
|
| 134 | |
|
| 135 | | #[derive(Clone, Default)] |
| 136 | | struct Deferred { |
| 137 | | |
| 138 | | |
| 139 | | body: std::sync::OnceLock<Result<DeferredBody, String>>, |
| 140 | | |
| 141 | | raw: Option<RawHistory>, |
| 142 | | |
| 143 | | |
| 144 | | more: Vec<(ChangeHash, Vec<Edit>)>, |
| 145 | | more_texts: Vec<TextRef>, |
| 146 | | |
| 147 | | |
| 148 | | key: std::sync::OnceLock<[u8; 32]>, |
| 149 | | } |
| 150 | |
|
| 151 | |
|
| 152 | |
|
| 153 | | #[derive(Clone)] |
| 154 | | pub enum Histories { |
| 155 | | Bytes(Arc<Vec<u8>>), |
| 156 | | |
| 157 | | File(Arc<std::fs::File>, u64, u64), |
| 158 | | } |
| 159 | |
|
| 160 | | impl Histories { |
| 161 | 16646× | fn len(&self) -> u64 { |
| 162 | 16646× | match self { |
| 163 | 4517× | Histories::Bytes(b) => b.len() as u64, |
| 164 | 12129× | Histories::File(_, _, len) => *len, |
| 165 | | } |
| 166 | 16646× | } |
| 167 | |
|
| 168 | 21772× | fn read(&self, at: u64, len: usize) -> std::io::Result<Vec<u8>> { |
| 169 | 21772× | match self { |
| 170 | 4517× | Histories::Bytes(b) => Ok(b[at as usize..at as usize + len].to_vec()), |
| 171 | 17255× | Histories::File(f, start, _) => { |
| 172 | 17255× | let mut buf = vec![0u8; len]; |
| 173 | 17255× | read_exact_at(f, &mut buf, start + at)?; |
| 174 | 17255× | Ok(buf) |
| 175 | | } |
| 176 | | } |
| 177 | 21772× | } |
| 178 | | } |
| 179 | |
|
| 180 | | #[cfg(unix)] |
| 181 | 17255× | fn read_exact_at(f: &std::fs::File, buf: &mut [u8], at: u64) -> std::io::Result<()> { |
| 182 | 17255× | std::os::unix::fs::FileExt::read_exact_at(f, buf, at) |
| 183 | 17255× | } |
| 184 | |
|
| 185 | | #[cfg(windows)] |
| 186 | | fn read_exact_at(f: &std::fs::File, mut buf: &mut [u8], mut at: u64) -> std::io::Result<()> { |
| 187 | | while !buf.is_empty() { |
| 188 | | match std::os::windows::fs::FileExt::seek_read(f, buf, at)? { |
| 189 | | 0 => return Err(std::io::ErrorKind::UnexpectedEof.into()), |
| 190 | | n => { |
| 191 | | buf = &mut buf[n..]; |
| 192 | | at += n as u64; |
| 193 | | } |
| 194 | | } |
| 195 | | } |
| 196 | | Ok(()) |
| 197 | | } |
| 198 | |
|
| 199 | |
|
| 200 | | #[derive(Clone)] |
| 201 | | struct RawHistory { |
| 202 | | from: Histories, |
| 203 | | at: u64, |
| 204 | | len: usize, |
| 205 | | sum: [u8; 32], |
| 206 | | } |
| 207 | |
|
| 208 | | impl RawHistory { |
| 209 | | |
| 210 | 21772× | fn bytes(&self) -> Result<Vec<u8>, ObjectError> { |
| 211 | 21772× | let damaged = |why: String| ObjectError::DamagedIndex(why); |
| 212 | 21772× | let b = self |
| 213 | 21772× | .from |
| 214 | 21772× | .read(self.at, self.len) |
| 215 | 21772× | .map_err(|e| damaged(format!("a file's history cannot be read: {e}")))?; |
| 216 | 21772× | if *blake3::hash(&b).as_bytes() != self.sum { |
| 217 | 5× | return Err(damaged("a file's history does not match its hash".into())); |
| 218 | 21767× | } |
| 219 | 21767× | Ok(b) |
| 220 | 21772× | } |
| 221 | | } |
| 222 | |
|
| 223 | |
|
| 224 | | #[derive(Default)] |
| 225 | | struct ClosureMemo { |
| 226 | | sets: HashMap<ChangeHash, Arc<HashSet<ChangeHash>>>, |
| 227 | | held: usize, |
| 228 | | } |
| 229 | |
|
| 230 | |
|
| 231 | |
|
| 232 | | const CLOSURE_MEMO_HASHES: usize = 4_000_000; |
| 233 | |
|
| 234 | | #[derive(Clone, Default)] |
| 235 | | struct DeferredBody { |
| 236 | | base: Option<DeferredBase>, |
| 237 | | edits: Vec<(ChangeHash, Vec<Edit>)>, |
| 238 | | |
| 239 | | |
| 240 | | texts: Vec<TextRef>, |
| 241 | | } |
| 242 | |
|
| 243 | | impl Deferred { |
| 244 | 159× | fn from_body(body: DeferredBody) -> Deferred { |
| 245 | 159× | Deferred { |
| 246 | 159× | body: std::sync::OnceLock::from(Ok(body)), |
| 247 | 159× | ..Deferred::default() |
| 248 | 159× | } |
| 249 | 159× | } |
| 250 | |
|
| 251 | | |
| 252 | 104689× | fn body(&self) -> Result<&DeferredBody, ObjectError> { |
| 253 | 104689× | self.body |
| 254 | 104689× | .get_or_init(|| { |
| 255 | 38429× | let mut b = match &self.raw { |
| 256 | | |
| 257 | | |
| 258 | 5431× | Some(raw) => raw |
| 259 | 5431× | .bytes() |
| 260 | 5431× | .and_then(|b| State::read_deferred_body(&b)) |
| 261 | 5431× | .map_err(|e| e.to_string())?, |
| 262 | 32998× | None => DeferredBody::default(), |
| 263 | | }; |
| 264 | 38428× | b.edits.extend(self.more.iter().cloned()); |
| 265 | 38428× | b.texts.extend(self.more_texts.iter().cloned()); |
| 266 | 38428× | Ok(b) |
| 267 | 38429× | }) |
| 268 | 104689× | .as_ref() |
| 269 | 104689× | .map_err(|e| ObjectError::DamagedIndex(e.clone())) |
| 270 | 104689× | } |
| 271 | |
|
| 272 | | |
| 273 | | |
| 274 | 36285× | fn add(&mut self, h: ChangeHash, edits: Vec<Edit>, texts: Vec<TextRef>) { |
| 275 | 36285× | if self.raw.is_some() && !matches!(self.body.get(), Some(Ok(_))) { |
| 276 | 5× | self.more.push((h, edits)); |
| 277 | 5× | self.more_texts.extend(texts); |
| 278 | | |
| 279 | 5× | return; |
| 280 | 36280× | } |
| 281 | | |
| 282 | 36280× | let b = self.body_mut().expect("a history in memory"); |
| 283 | 36280× | b.edits.push((h, edits)); |
| 284 | 36280× | b.texts.extend(texts); |
| 285 | 36285× | } |
| 286 | |
|
| 287 | 36280× | fn body_mut(&mut self) -> Result<&mut DeferredBody, ObjectError> { |
| 288 | 36280× | self.body()?; |
| 289 | 36280× | self.raw = None; |
| 290 | 36280× | self.more.clear(); |
| 291 | 36280× | self.more_texts.clear(); |
| 292 | 36280× | Ok(self |
| 293 | 36280× | .body |
| 294 | 36280× | .get_mut() |
| 295 | 36280× | .and_then(|b| b.as_mut().ok()) |
| 296 | 36280× | .expect("decoded above")) |
| 297 | 36280× | } |
| 298 | |
|
| 299 | 23835× | fn into_body(mut self) -> Result<DeferredBody, ObjectError> { |
| 300 | 23835× | self.body()?; |
| 301 | 23834× | Ok(self |
| 302 | 23834× | .body |
| 303 | 23834× | .take() |
| 304 | 23834× | .and_then(|b| b.ok()) |
| 305 | 23834× | .expect("decoded above")) |
| 306 | 23835× | } |
| 307 | | } |
| 308 | |
|
| 309 | | #[derive(Clone)] |
| 310 | | enum DeferredBase { |
| 311 | | Inline(Value), |
| 312 | | Blob(ObjectRef), |
| 313 | | } |
| 314 | |
|
| 315 | |
|
| 316 | |
|
| 317 | |
|
| 318 | |
|
| 319 | |
|
| 320 | | impl State { |
| 321 | | const INDEX_MAGIC: &'static [u8] = b"oxy state index 4\n"; |
| 322 | |
|
| 323 | | |
| 324 | | |
| 325 | | |
| 326 | 1075× | pub fn write_index(&self) -> Option<Vec<u8>> { |
| 327 | | use crate::flat::Writer; |
| 328 | 1075× | let deferred = self.deferred.as_ref()?; |
| 329 | 1075× | if !self.files.is_empty() { |
| 330 | 0× | return None; |
| 331 | 1075× | } |
| 332 | | |
| 333 | | |
| 334 | 1075× | let mut w = Writer::default(); |
| 335 | 1075× | w.fixed(Self::INDEX_MAGIC); |
| 336 | | |
| 337 | | |
| 338 | 1075× | let mut changes: Vec<(&ChangeHash, &Arc<ChangeMeta>)> = self.changes.iter().collect(); |
| 339 | 1075× | changes.sort_unstable_by(|a, b| log_order((a.0, &a.1.hlc), (b.0, &b.1.hlc))); |
| 340 | 1075× | w.count(changes.len()); |
| 341 | 1075× | for (h, m) in changes { |
| 342 | 206× | w.object(h); |
| 343 | 206× | m.write_flat(&mut w); |
| 344 | 206× | } |
| 345 | 1075× | let changes_block = std::mem::take(&mut w); |
| 346 | 1075× | w.bytes(&changes_block.0); |
| 347 | | |
| 348 | | |
| 349 | 1075× | let mut tw = Writer::default(); |
| 350 | 1075× | self.tree.write_flat(&mut tw); |
| 351 | 1075× | w.bytes(&tw.0); |
| 352 | 1075× | let mut replaces: Vec<(&NodeId, &Vec<ReplaceRecord>)> = self.replaces.iter().collect(); |
| 353 | 1075× | replaces.sort_by_key(|(n, _)| **n); |
| 354 | 1075× | w.count(replaces.len()); |
| 355 | 1075× | for (n, recs) in replaces { |
| 356 | 6× | w.fixed(&n.0); |
| 357 | 6× | w.count(recs.len()); |
| 358 | | |
| 359 | 6× | let mut recs: Vec<&ReplaceRecord> = recs.iter().collect(); |
| 360 | 6× | recs.sort(); |
| 361 | 6× | for (c, old, new) in recs { |
| 362 | 6× | w.object(c); |
| 363 | 6× | w.opt_object(old); |
| 364 | 6× | w.opt_object(new); |
| 365 | 6× | } |
| 366 | | } |
| 367 | 1075× | let mut front = w; |
| 368 | | |
| 369 | | |
| 370 | 1075× | let mut table = Writer::default(); |
| 371 | 1075× | let mut histories: Vec<u8> = Vec::new(); |
| 372 | 1075× | let mut nodes: Vec<(&NodeId, &Arc<Deferred>)> = deferred.iter().collect(); |
| 373 | 1075× | nodes.sort_by_key(|(n, _)| **n); |
| 374 | 1075× | table.count(nodes.len()); |
| 375 | 32658× | for (n, d) in nodes { |
| 376 | 32658× | let key = match d.key.get() { |
| 377 | 16341× | Some(k) => *k, |
| 378 | | None => { |
| 379 | 16317× | let mut h = blake3::Hasher::new(); |
| 380 | 16317× | h.update(b"oxy graph key 1\0"); |
| 381 | 16317× | h.update(&n.0); |
| 382 | 16317× | let k = d.graph_key(h).ok()?; |
| 383 | 16317× | let _ = d.key.set(k); |
| 384 | 16317× | k |
| 385 | | } |
| 386 | | }; |
| 387 | | |
| 388 | 32658× | let bytes = match &d.raw { |
| 389 | 16341× | Some(raw) if d.more.is_empty() => raw.bytes().ok()?, |
| 390 | 16317× | _ => Self::write_deferred_body(d.body().ok()?)?, |
| 391 | | }; |
| 392 | 32654× | table.fixed(&n.0); |
| 393 | 32654× | table.fixed(&key); |
| 394 | 32654× | table.u64(histories.len() as u64); |
| 395 | 32654× | table.u32(u32::try_from(bytes.len()).ok()?); |
| 396 | 32654× | table.fixed(blake3::hash(&bytes).as_bytes()); |
| 397 | 32654× | histories.extend_from_slice(&bytes); |
| 398 | | } |
| 399 | 1071× | front.bytes(&table.0); |
| 400 | 1071× | let mut out = Writer::default(); |
| 401 | 1071× | out.u64(front.0.len() as u64); |
| 402 | 1071× | out.fixed(&front.0); |
| 403 | 1071× | out.fixed(&histories); |
| 404 | 1071× | Some(out.0) |
| 405 | 1075× | } |
| 406 | |
|
| 407 | | |
| 408 | | |
| 409 | 16317× | fn write_deferred_body(d: &DeferredBody) -> Option<Vec<u8>> { |
| 410 | | use crate::flat::Writer; |
| 411 | 32802× | let atom = |w: &mut Writer, a: &AtomRef| match a { |
| 412 | 16311× | AtomRef::Start => w.u8(0), |
| 413 | 16401× | AtomRef::End => w.u8(1), |
| 414 | 90× | AtomRef::Atom { change, index } => { |
| 415 | 90× | w.u8(2); |
| 416 | 90× | w.object(change); |
| 417 | 90× | w.u32(*index); |
| 418 | 90× | } |
| 419 | 32802× | }; |
| 420 | 16317× | let mut w = Writer::default(); |
| 421 | 6× | match &d.base { |
| 422 | 16311× | None => w.u8(0), |
| 423 | 0× | Some(DeferredBase::Blob(r)) => { |
| 424 | 0× | w.u8(1); |
| 425 | 0× | w.object(r); |
| 426 | 0× | } |
| 427 | 6× | Some(DeferredBase::Inline(v)) => { |
| 428 | 6× | w.u8(2); |
| 429 | 6× | w.bytes(&cbor::encode(v)); |
| 430 | 6× | } |
| 431 | | } |
| 432 | | |
| 433 | | |
| 434 | | |
| 435 | 16317× | let mut texts = d.texts.iter(); |
| 436 | 16317× | let mut per_change: Vec<(&ChangeHash, &Vec<Edit>, Vec<&TextRef>)> = Vec::new(); |
| 437 | 16401× | for (c, edits) in &d.edits { |
| 438 | 16401× | let n = edits |
| 439 | 16401× | .iter() |
| 440 | 16401× | .filter(|e| matches!(e, Edit::Insert { lines, .. } if lines.is_empty())) |
| 441 | 16401× | .count(); |
| 442 | 16401× | per_change.push((c, edits, texts.by_ref().take(n).collect())); |
| 443 | | } |
| 444 | 16317× | per_change.sort_by_key(|(c, _, _)| **c); |
| 445 | 16317× | w.count(per_change.len()); |
| 446 | 16401× | for (c, edits, _) in &per_change { |
| 447 | 16401× | w.object(c); |
| 448 | 16401× | w.count(edits.len()); |
| 449 | 16401× | for e in edits.iter() { |
| 450 | 16401× | match e { |
| 451 | | Edit::Insert { |
| 452 | 16401× | node, |
| 453 | 16401× | after, |
| 454 | 16401× | before, |
| 455 | 16401× | lines, |
| 456 | | } => { |
| 457 | 16401× | if !lines.is_empty() { |
| 458 | 0× | return None; |
| 459 | 16401× | } |
| 460 | 16401× | w.u8(0); |
| 461 | 16401× | w.fixed(&node.0); |
| 462 | 16401× | atom(&mut w, after); |
| 463 | 16401× | atom(&mut w, before); |
| 464 | | } |
| 465 | 0× | Edit::Delete { node, atoms } => { |
| 466 | 0× | w.u8(1); |
| 467 | 0× | w.fixed(&node.0); |
| 468 | 0× | w.count(atoms.len()); |
| 469 | 0× | for r in atoms { |
| 470 | 0× | w.object(&r.change); |
| 471 | 0× | w.u32(r.from); |
| 472 | 0× | w.u32(r.to); |
| 473 | 0× | } |
| 474 | | } |
| 475 | 0× | Edit::Replace { .. } => return None, |
| 476 | | } |
| 477 | | } |
| 478 | | } |
| 479 | 16317× | let texts: Vec<&TextRef> = per_change |
| 480 | 16317× | .iter() |
| 481 | 16401× | .flat_map(|(_, _, t)| t.iter().copied()) |
| 482 | 16317× | .collect(); |
| 483 | 16317× | w.count(texts.len()); |
| 484 | 16401× | for t in texts { |
| 485 | 16401× | match t { |
| 486 | 0× | TextRef::Blob(r, count, form) => { |
| 487 | 0× | w.u8(0); |
| 488 | 0× | w.object(r); |
| 489 | 0× | w.u32(*count); |
| 490 | 0× | w.u8(match form { |
| 491 | 0× | crate::objects::TextForm::Cbor => 0, |
| 492 | 0× | crate::objects::TextForm::Raw => 1, |
| 493 | 0× | crate::objects::TextForm::CborFallback => 2, |
| 494 | | }); |
| 495 | | } |
| 496 | 16401× | TextRef::Inline { change, start, end } => { |
| 497 | 16401× | w.u8(1); |
| 498 | 16401× | w.object(change); |
| 499 | 16401× | w.u32(*start); |
| 500 | 16401× | w.u32(*end); |
| 501 | 16401× | } |
| 502 | | } |
| 503 | | } |
| 504 | 16317× | Some(w.0) |
| 505 | 16317× | } |
| 506 | |
|
| 507 | | |
| 508 | 275× | pub fn read_index(bytes: &[u8]) -> Result<State, ObjectError> { |
| 509 | 275× | let bad = || ObjectError::Schema("state index: truncated".into()); |
| 510 | 275× | let front_len = |
| 511 | 275× | usize::try_from(crate::flat::Reader::new(bytes).u64()?).map_err(|_| bad())?; |
| 512 | 275× | let front = bytes.get(8..8 + front_len).ok_or_else(bad)?; |
| 513 | 275× | let histories = Histories::Bytes(Arc::new(bytes[8 + front_len..].to_vec())); |
| 514 | 275× | Self::read_index_front(front, histories) |
| 515 | 275× | } |
| 516 | |
|
| 517 | | |
| 518 | | |
| 519 | | |
| 520 | 2165× | pub fn read_index_front(bytes: &[u8], histories: Histories) -> Result<State, ObjectError> { |
| 521 | | use crate::flat::Reader; |
| 522 | 2165× | let bad = |what: &str| ObjectError::Schema(format!("state index: {what}")); |
| 523 | 2165× | let mut r = Reader::new(bytes); |
| 524 | 2165× | let mut st = State::new_history_only(); |
| 525 | | { |
| 526 | 2165× | let _t = crate::timing::phase("index: changes"); |
| 527 | 2165× | st.changes = Self::read_index_changes(r.bytes()?)?; |
| 528 | | } |
| 529 | 2165× | let tree_bytes = r.bytes()?; |
| 530 | 2165× | for _ in 0..r.count()? { |
| 531 | 5× | let n = NodeId(r.fixed::<16>()?); |
| 532 | 5× | let mut recs = Vec::new(); |
| 533 | 5× | for _ in 0..r.count()? { |
| 534 | 5× | recs.push((r.object()?, r.opt_object()?, r.opt_object()?)); |
| 535 | | } |
| 536 | 5× | st.replaces.insert(n, recs); |
| 537 | | } |
| 538 | 2165× | let deferred_bytes = r.bytes()?; |
| 539 | 2165× | if !r.at_end() { |
| 540 | 0× | return Err(bad("trailing bytes")); |
| 541 | 2165× | } |
| 542 | 2165× | let (tree, deferred) = rayon::join( |
| 543 | 2165× | || TreeGraph::read_flat(&mut Reader::new(tree_bytes)), |
| 544 | 2165× | || Self::read_deferred(deferred_bytes, &histories), |
| 545 | | ); |
| 546 | 2165× | st.tree = tree?; |
| 547 | 2165× | st.deferred = Some(deferred?); |
| 548 | 2165× | Ok(st) |
| 549 | 2165× | } |
| 550 | |
|
| 551 | | |
| 552 | | |
| 553 | 2165× | pub fn read_index_changes( |
| 554 | 2165× | bytes: &[u8], |
| 555 | 2165× | ) -> Result<crate::fasthash::FastMap<ChangeHash, Arc<ChangeMeta>>, ObjectError> { |
| 556 | 2165× | Ok(Self::read_index_changes_listed(bytes)? |
| 557 | 2165× | .into_iter() |
| 558 | 2165× | .map(|(h, m)| (h, Arc::new(m))) |
| 559 | 2165× | .collect()) |
| 560 | 2165× | } |
| 561 | |
|
| 562 | | |
| 563 | | |
| 564 | | |
| 565 | 2334× | pub fn read_index_changes_listed( |
| 566 | 2334× | bytes: &[u8], |
| 567 | 2334× | ) -> Result<Vec<(ChangeHash, ChangeMeta)>, ObjectError> { |
| 568 | | use crate::flat::Reader; |
| 569 | 2334× | let mut r = Reader::new(bytes); |
| 570 | 2334× | if r.fixed::<18>()?.as_slice() != Self::INDEX_MAGIC { |
| 571 | 0× | return Err(ObjectError::Schema("state index: not a state index".into())); |
| 572 | 2334× | } |
| 573 | 2334× | let n = r.count()?; |
| 574 | 2334× | let mut changes = Vec::with_capacity(n); |
| 575 | 2334× | for _ in 0..n { |
| 576 | 10129× | let h = r.object()?; |
| 577 | 10129× | changes.push((h, ChangeMeta::read_flat(&mut r)?)); |
| 578 | | } |
| 579 | 2333× | if !r.at_end() { |
| 580 | 0× | return Err(ObjectError::Schema("state index: trailing bytes".into())); |
| 581 | 2333× | } |
| 582 | 2333× | Ok(changes) |
| 583 | 2334× | } |
| 584 | |
|
| 585 | | |
| 586 | | |
| 587 | 2165× | fn read_deferred( |
| 588 | 2165× | table: &[u8], |
| 589 | 2165× | histories: &Histories, |
| 590 | 2165× | ) -> Result<crate::fasthash::FastMap<NodeId, Arc<Deferred>>, ObjectError> { |
| 591 | | use crate::flat::Reader; |
| 592 | 2165× | let _t = crate::timing::phase("index: deferred"); |
| 593 | 2165× | let mut r = Reader::new(table); |
| 594 | 2165× | let mut deferred = crate::fasthash::FastMap::default(); |
| 595 | 2165× | let n = r.count()?; |
| 596 | 2165× | deferred.reserve(n); |
| 597 | 2165× | for _ in 0..n { |
| 598 | 16646× | let id = NodeId(r.fixed::<16>()?); |
| 599 | 16646× | let key = r.fixed::<32>()?; |
| 600 | | |
| 601 | | |
| 602 | 16646× | let (at, len, sum) = (r.u64()?, r.u32()? as usize, r.fixed::<32>()?); |
| 603 | 16646× | if at |
| 604 | 16646× | .checked_add(len as u64) |
| 605 | 16646× | .is_none_or(|end| end > histories.len()) |
| 606 | | { |
| 607 | 0× | return Err(ObjectError::Schema( |
| 608 | 0× | "state index: a file's history lies outside it".into(), |
| 609 | 0× | )); |
| 610 | 16646× | } |
| 611 | 16646× | let d = Deferred { |
| 612 | 16646× | raw: Some(RawHistory { |
| 613 | 16646× | from: histories.clone(), |
| 614 | 16646× | at, |
| 615 | 16646× | len, |
| 616 | 16646× | sum, |
| 617 | 16646× | }), |
| 618 | 16646× | key: std::sync::OnceLock::from(key), |
| 619 | 16646× | ..Deferred::default() |
| 620 | 16646× | }; |
| 621 | 16646× | deferred.insert(id, Arc::new(d)); |
| 622 | | } |
| 623 | 2165× | if !r.at_end() { |
| 624 | 0× | return Err(ObjectError::Schema("state index: trailing bytes".into())); |
| 625 | 2165× | } |
| 626 | 2165× | Ok(deferred) |
| 627 | 2165× | } |
| 628 | |
|
| 629 | | |
| 630 | 5430× | fn read_deferred_body(bytes: &[u8]) -> Result<DeferredBody, ObjectError> { |
| 631 | | use crate::flat::Reader; |
| 632 | 5430× | let bad = |what: &str| ObjectError::Schema(format!("state index: {what}")); |
| 633 | 5435× | let node = |r: &mut Reader| -> Result<NodeId, ObjectError> { Ok(NodeId(r.fixed::<16>()?)) }; |
| 634 | 10870× | let atom = |r: &mut Reader| -> Result<AtomRef, ObjectError> { |
| 635 | 10870× | Ok(match r.u8()? { |
| 636 | 5419× | 0 => AtomRef::Start, |
| 637 | 5435× | 1 => AtomRef::End, |
| 638 | | 2 => AtomRef::Atom { |
| 639 | 16× | change: r.object()?, |
| 640 | 16× | index: r.u32()?, |
| 641 | | }, |
| 642 | 0× | _ => return Err(bad("atom")), |
| 643 | | }) |
| 644 | 10870× | }; |
| 645 | 5430× | let mut r = Reader::new(bytes); |
| 646 | 5430× | let base = match r.u8()? { |
| 647 | 5419× | 0 => None, |
| 648 | 0× | 1 => Some(DeferredBase::Blob(r.object()?)), |
| 649 | 11× | _ => Some(DeferredBase::Inline(cbor::decode(r.bytes()?)?)), |
| 650 | | }; |
| 651 | 5430× | let mut edits = Vec::new(); |
| 652 | 5430× | for _ in 0..r.count()? { |
| 653 | 5435× | let c = r.object()?; |
| 654 | 5435× | let mut es = Vec::new(); |
| 655 | 5435× | for _ in 0..r.count()? { |
| 656 | 5435× | es.push(match r.u8()? { |
| 657 | | 0 => Edit::Insert { |
| 658 | 5435× | node: node(&mut r)?, |
| 659 | 5435× | after: atom(&mut r)?, |
| 660 | 5435× | before: atom(&mut r)?, |
| 661 | 5435× | lines: crate::lines::Lines::default(), |
| 662 | | }, |
| 663 | | 1 => { |
| 664 | 0× | let node = node(&mut r)?; |
| 665 | 0× | let mut atoms = Vec::new(); |
| 666 | 0× | for _ in 0..r.count()? { |
| 667 | 0× | atoms.push(crate::objects::AtomRange { |
| 668 | 0× | change: r.object()?, |
| 669 | 0× | from: r.u32()?, |
| 670 | 0× | to: r.u32()?, |
| 671 | | }); |
| 672 | | } |
| 673 | 0× | Edit::Delete { node, atoms } |
| 674 | | } |
| 675 | 0× | _ => return Err(bad("edit")), |
| 676 | | }); |
| 677 | | } |
| 678 | 5435× | edits.push((c, es)); |
| 679 | | } |
| 680 | 5430× | let mut texts = Vec::new(); |
| 681 | 5430× | for _ in 0..r.count()? { |
| 682 | 5435× | texts.push(match r.u8()? { |
| 683 | | 0 => TextRef::Blob( |
| 684 | 0× | r.object()?, |
| 685 | 0× | r.u32()?, |
| 686 | 0× | match r.u8()? { |
| 687 | 0× | 0 => crate::objects::TextForm::Cbor, |
| 688 | 0× | 1 => crate::objects::TextForm::Raw, |
| 689 | 0× | _ => crate::objects::TextForm::CborFallback, |
| 690 | | }, |
| 691 | | ), |
| 692 | | _ => TextRef::Inline { |
| 693 | 5435× | change: r.object()?, |
| 694 | 5435× | start: r.u32()?, |
| 695 | 5435× | end: r.u32()?, |
| 696 | | }, |
| 697 | | }); |
| 698 | | } |
| 699 | 5430× | if !r.at_end() { |
| 700 | 0× | return Err(bad("trailing bytes in a file's history")); |
| 701 | 5430× | } |
| 702 | 5430× | Ok(DeferredBody { base, edits, texts }) |
| 703 | 5430× | } |
| 704 | | } |
| 705 | |
|
| 706 | | impl Clone for State { |
| 707 | 1884× | fn clone(&self) -> State { |
| 708 | 1884× | State { |
| 709 | 1884× | changes: self.changes.clone(), |
| 710 | 1884× | tree: self.tree.clone(), |
| 711 | 1884× | files: self.files.clone(), |
| 712 | 1884× | replaces: self.replaces.clone(), |
| 713 | 1884× | |
| 714 | 1884× | closure: Default::default(), |
| 715 | 1884× | levels: Default::default(), |
| 716 | 1884× | deferred: self.deferred.clone(), |
| 717 | 1884× | unified_view: self.unified_view.clone(), |
| 718 | 1884× | } |
| 719 | 1884× | } |
| 720 | | } |
| 721 | |
|
| 722 | | #[derive(Clone, Debug, PartialEq, Eq)] |
| 723 | | pub enum FileContent { |
| 724 | | Text { |
| 725 | | bytes: Vec<u8>, |
| 726 | | materialized: Materialized, |
| 727 | | }, |
| 728 | | |
| 729 | | Opaque { |
| 730 | | blobs: Vec<ObjectRef>, |
| 731 | | }, |
| 732 | | Dir, |
| 733 | | } |
| 734 | |
|
| 735 | | #[derive(Clone, Debug, PartialEq, Eq)] |
| 736 | | pub struct FileState { |
| 737 | | pub node: NodeId, |
| 738 | | pub kind: NodeKind, |
| 739 | | pub mode: Mode, |
| 740 | | pub content: FileContent, |
| 741 | | } |
| 742 | |
|
| 743 | | impl FileState { |
| 744 | 13814× | pub fn is_conflicted(&self) -> bool { |
| 745 | 13814× | match &self.content { |
| 746 | 12846× | FileContent::Text { materialized, .. } => materialized.is_conflicted(), |
| 747 | 292× | FileContent::Opaque { blobs } => blobs.len() > 1, |
| 748 | 676× | FileContent::Dir => false, |
| 749 | | } |
| 750 | 13814× | } |
| 751 | | } |
| 752 | |
|
| 753 | |
|
| 754 | | #[derive(Clone, Debug, Default, PartialEq, Eq)] |
| 755 | | pub struct ConflictRegions { |
| 756 | | pub plain: Vec<(AtomKey, Vec<u8>)>, |
| 757 | | pub region_atoms: Vec<AtomKey>, |
| 758 | | pub contributors: Vec<ChangeHash>, |
| 759 | | } |
| 760 | |
|
| 761 | |
|
| 762 | | #[derive(Clone, Debug, Default)] |
| 763 | | pub struct Snapshot { |
| 764 | | pub tree: TreeView, |
| 765 | | pub files: BTreeMap<String, FileState>, |
| 766 | | |
| 767 | | |
| 768 | | pub unrendered: BTreeSet<String>, |
| 769 | | } |
| 770 | |
|
| 771 | | impl Snapshot { |
| 772 | 2306× | pub fn is_conflicted(&self) -> bool { |
| 773 | 13530× | self.tree.is_conflicted() || self.files.values().any(|f| f.is_conflicted()) |
| 774 | 2306× | } |
| 775 | | } |
| 776 | |
|
| 777 | 65040× | fn vertex(r: AtomRef) -> Vertex { |
| 778 | 65040× | match r { |
| 779 | 27194× | AtomRef::Start => Vertex::Start, |
| 780 | 28509× | AtomRef::End => Vertex::End, |
| 781 | 9337× | AtomRef::Atom { change, index } => Vertex::Atom((change, index)), |
| 782 | | } |
| 783 | 65040× | } |
| 784 | |
|
| 785 | |
|
| 786 | 39578× | pub fn resolve_tree_op(op: &TreeOp, me: ChangeHash) -> TreeOp { |
| 787 | 39578× | match op { |
| 788 | 702× | TreeOp::RemoveNode { node, placement } => TreeOp::RemoveNode { |
| 789 | 702× | node: *node, |
| 790 | 702× | placement: placement.resolve(me), |
| 791 | 702× | }, |
| 792 | | TreeOp::Move { |
| 793 | 154× | node, |
| 794 | 154× | old, |
| 795 | 154× | parent, |
| 796 | 154× | name, |
| 797 | 154× | } => TreeOp::Move { |
| 798 | 154× | node: *node, |
| 799 | 154× | old: old.resolve(me), |
| 800 | 154× | parent: *parent, |
| 801 | 154× | name: name.clone(), |
| 802 | 154× | }, |
| 803 | 22× | TreeOp::SetMode { node, old, mode } => TreeOp::SetMode { |
| 804 | 22× | node: *node, |
| 805 | 22× | old: old.resolve(me), |
| 806 | 22× | mode: *mode, |
| 807 | 22× | }, |
| 808 | 38700× | add @ TreeOp::AddNode { .. } => add.clone(), |
| 809 | | } |
| 810 | 39578× | } |
| 811 | |
|
| 812 | |
|
| 813 | |
|
| 814 | 27055× | fn apply_file_edits(g: &mut FileGraph, h: ChangeHash, edits: Vec<Edit>) { |
| 815 | | |
| 816 | 27055× | let order = g.take_order(); |
| 817 | 27055× | let mut inserts: Vec<(Vertex, Vertex, u32, u32)> = Vec::new(); |
| 818 | 27055× | let mut deleted: Vec<crate::graph::AtomKey> = Vec::new(); |
| 819 | 27055× | let mut next = 0u32; |
| 820 | 29415× | for e in edits { |
| 821 | 29415× | match e { |
| 822 | | Edit::Insert { |
| 823 | 27882× | after, |
| 824 | 27882× | before, |
| 825 | 27882× | lines, |
| 826 | | .. |
| 827 | 27882× | } => { |
| 828 | 27882× | let first = next; |
| 829 | 27882× | let count = lines.len() as u32; |
| 830 | 27882× | next += count; |
| 831 | 27882× | let (after, before) = (vertex(after.resolve(h)), vertex(before.resolve(h))); |
| 832 | 27882× | inserts.push((after, before, first, count)); |
| 833 | 27882× | g.insert_owned(h, first, after, before, lines); |
| 834 | 27882× | } |
| 835 | 1533× | Edit::Delete { atoms, .. } => { |
| 836 | 2612× | for r in atoms { |
| 837 | 2612× | let r = r.resolve(h); |
| 838 | 2744× | deleted.extend((r.from..r.to).map(|i| (r.change, i))); |
| 839 | 2612× | g.delete(h, &r); |
| 840 | | } |
| 841 | | } |
| 842 | 0× | Edit::Replace { .. } => {} |
| 843 | | } |
| 844 | | } |
| 845 | 27055× | if let Some(o) = order { |
| 846 | 66× | g.keep_spliced(o, h, &inserts, &deleted); |
| 847 | 26989× | } |
| 848 | 27055× | } |
| 849 | |
|
| 850 | |
|
| 851 | |
|
| 852 | |
|
| 853 | 4551× | fn build_deferred( |
| 854 | 4551× | taken: Vec<(NodeId, Deferred)>, |
| 855 | 4551× | load: impl FnOnce(&[ObjectRef]) -> Result<Vec<Vec<u8>>, ObjectError>, |
| 856 | 4551× | read_change: impl Fn(&ChangeHash) -> Result<Arc<Vec<u8>>, ObjectError>, |
| 857 | 4551× | ) -> Result<Vec<(NodeId, FileGraph)>, ObjectError> { |
| 858 | 4551× | let mut taken: Vec<(NodeId, DeferredBody)> = taken |
| 859 | 4551× | .into_iter() |
| 860 | 23835× | .map(|(n, d)| Ok((n, d.into_body()?))) |
| 861 | 4551× | .collect::<Result<_, ObjectError>>()?; |
| 862 | 4550× | let mut refs: Vec<ObjectRef> = taken |
| 863 | 4550× | .iter() |
| 864 | 4550× | .filter_map(|(_, d)| match &d.base { |
| 865 | 6× | Some(DeferredBase::Blob(r)) => Some(*r), |
| 866 | 23828× | _ => None, |
| 867 | 23834× | }) |
| 868 | 4550× | .collect(); |
| 869 | | |
| 870 | 4550× | let bases = refs.len(); |
| 871 | 23834× | refs.extend(taken.iter().flat_map(|(_, d)| { |
| 872 | 27198× | d.texts.iter().filter_map(|t| match t { |
| 873 | 70× | TextRef::Blob(r, _, _) => Some(*r), |
| 874 | 27128× | TextRef::Inline { .. } => None, |
| 875 | 27198× | }) |
| 876 | 23834× | })); |
| 877 | | |
| 878 | | |
| 879 | 4550× | let reading = crate::timing::phase("graphs: read changes and blobs"); |
| 880 | 4550× | let mut changes: HashMap<ChangeHash, Arc<Vec<u8>>> = HashMap::new(); |
| 881 | 27198× | for t in taken.iter().flat_map(|(_, d)| d.texts.iter()) { |
| 882 | 27198× | if let TextRef::Inline { change, .. } = t { |
| 883 | 27128× | if !changes.contains_key(change) { |
| 884 | 7148× | changes.insert(*change, read_change(change)?); |
| 885 | 19980× | } |
| 886 | 70× | } |
| 887 | | } |
| 888 | 4550× | let n_changes = changes.len(); |
| 889 | 4550× | drop(reading); |
| 890 | 4550× | let reading = crate::timing::phase("graphs: of which blobs"); |
| 891 | 4550× | let mut blobs = if refs.is_empty() { |
| 892 | 4479× | Vec::new() |
| 893 | | } else { |
| 894 | 71× | load(&refs)? |
| 895 | | }; |
| 896 | 4547× | if crate::timing::enabled() { |
| 897 | 2× | eprintln!( |
| 898 | 2× | "timing graphs: {} graphs, {n_changes} changes, {} blobs", |
| 899 | 2× | taken.len(), |
| 900 | 2× | refs.len() |
| 901 | 2× | ); |
| 902 | 4545× | } |
| 903 | 4547× | if blobs.len() != refs.len() { |
| 904 | 0× | return Err(ObjectError::Schema("graph blobs: wrong count".into())); |
| 905 | 4547× | } |
| 906 | 4547× | drop(reading); |
| 907 | 4547× | let lines = crate::timing::phase("graphs: hand out blobs"); |
| 908 | 4547× | let mut texts = blobs.split_off(bases).into_iter(); |
| 909 | 4547× | let mut blobs = blobs.into_iter(); |
| 910 | | |
| 911 | | |
| 912 | | type Work = (NodeId, DeferredBody, Option<Vec<u8>>, Vec<Vec<u8>>); |
| 913 | 4547× | let mut work: Vec<Work> = Vec::with_capacity(taken.len()); |
| 914 | 23831× | for (node, d) in taken.drain(..) { |
| 915 | 23831× | let wanted = d |
| 916 | 23831× | .texts |
| 917 | 23831× | .iter() |
| 918 | 27196× | .filter(|t| matches!(t, TextRef::Blob(..))) |
| 919 | 23831× | .count(); |
| 920 | 23831× | let mine: Vec<Vec<u8>> = texts.by_ref().take(wanted).collect(); |
| 921 | 23831× | if mine.len() != wanted { |
| 922 | 0× | return Err(ObjectError::Schema("text blobs: wrong count".into())); |
| 923 | 23831× | } |
| 924 | 23831× | let bytes = match &d.base { |
| 925 | | Some(DeferredBase::Blob(_)) => Some( |
| 926 | 5× | blobs |
| 927 | 5× | .next() |
| 928 | 5× | .ok_or_else(|| ObjectError::Schema("graph blobs: wrong count".into()))?, |
| 929 | | ), |
| 930 | 23826× | _ => None, |
| 931 | | }; |
| 932 | 23831× | work.push((node, d, bytes, mine)); |
| 933 | | } |
| 934 | 4547× | drop(lines); |
| 935 | 4547× | let _t = crate::timing::phase("graphs: lines and build"); |
| 936 | | use rayon::prelude::*; |
| 937 | 4547× | let changes = &changes; |
| 938 | 4547× | let built: Vec<(NodeId, FileGraph)> = work |
| 939 | 4547× | .into_par_iter() |
| 940 | 23831× | .map(|(node, mut d, bytes, mine)| { |
| 941 | | |
| 942 | 23831× | let mut want = std::mem::take(&mut d.texts).into_iter(); |
| 943 | 23831× | let mut mine = mine.into_iter(); |
| 944 | 26574× | for (_, edits) in d.edits.iter_mut() { |
| 945 | 28477× | for e in edits.iter_mut() { |
| 946 | 28477× | if let Edit::Insert { lines, .. } = e { |
| 947 | 27203× | if lines.is_empty() { |
| 948 | 27196× | *lines = match want.next() { |
| 949 | 68× | Some(TextRef::Blob(_, count, form)) => { |
| 950 | 68× | let content = mine.next().ok_or_else(|| { |
| 951 | 0× | ObjectError::Schema("text blobs: wrong count".into()) |
| 952 | 0× | })?; |
| 953 | 68× | crate::objects::text_lines(&content, count, form)? |
| 954 | | } |
| 955 | 27128× | Some(TextRef::Inline { change, start, end }) => { |
| 956 | 27128× | let bytes = &changes[&change]; |
| 957 | 27128× | let range = bytes |
| 958 | 27128× | .get(start as usize..end as usize) |
| 959 | 27128× | .ok_or_else(|| { |
| 960 | 0× | ObjectError::Schema( |
| 961 | 0× | "an inline insert lies outside its change".into(), |
| 962 | 0× | ) |
| 963 | 0× | })?; |
| 964 | 27128× | crate::objects::inline_lines(range)? |
| 965 | | } |
| 966 | | None => { |
| 967 | 0× | return Err(ObjectError::Schema( |
| 968 | 0× | "an insert's text is missing".into(), |
| 969 | 0× | )) |
| 970 | | } |
| 971 | | }; |
| 972 | 7× | } |
| 973 | 1274× | } |
| 974 | | } |
| 975 | | } |
| 976 | 23831× | let mut graph = match (d.base.take(), bytes) { |
| 977 | 109× | (Some(DeferredBase::Inline(v)), _) => FileGraph::from_value(&v)?, |
| 978 | 5× | (Some(DeferredBase::Blob(_)), Some(bytes)) => { |
| 979 | 5× | FileGraph::from_value(&cbor::decode(&bytes)?)? |
| 980 | | } |
| 981 | 23717× | _ => FileGraph::default(), |
| 982 | | }; |
| 983 | 26574× | for (h, edits) in std::mem::take(&mut d.edits) { |
| 984 | 26574× | apply_file_edits(&mut graph, h, edits); |
| 985 | 26574× | } |
| 986 | 23831× | Ok((node, graph)) |
| 987 | 23831× | }) |
| 988 | 4547× | .collect::<Result<_, ObjectError>>()?; |
| 989 | 4547× | Ok(built) |
| 990 | 4551× | } |
| 991 | |
|
| 992 | | impl State { |
| 993 | 727× | pub fn new() -> Self { |
| 994 | 727× | Self::default() |
| 995 | 727× | } |
| 996 | |
|
| 997 | | |
| 998 | | |
| 999 | | |
| 1000 | | |
| 1001 | 4216× | pub fn new_history_only() -> Self { |
| 1002 | 4216× | State { |
| 1003 | 4216× | deferred: Some(Default::default()), |
| 1004 | 4216× | ..Self::default() |
| 1005 | 4216× | } |
| 1006 | 4216× | } |
| 1007 | |
|
| 1008 | | |
| 1009 | 40× | pub fn is_built(&self, node: &NodeId) -> bool { |
| 1010 | 40× | self.deferred.is_none() || self.files.contains_key(node) |
| 1011 | 40× | } |
| 1012 | |
|
| 1013 | | |
| 1014 | | |
| 1015 | 3922× | pub fn is_history_only(&self) -> bool { |
| 1016 | 3922× | self.deferred.is_some() |
| 1017 | 3922× | } |
| 1018 | |
|
| 1019 | | |
| 1020 | 3243× | pub fn is_full(&self) -> bool { |
| 1021 | 3243× | self.deferred.as_ref().is_none_or(|d| d.is_empty()) |
| 1022 | 3243× | } |
| 1023 | |
|
| 1024 | | |
| 1025 | | |
| 1026 | 26842× | fn graph(&self, node: &NodeId) -> Option<&FileGraph> { |
| 1027 | 26842× | if let Some(d) = &self.deferred { |
| 1028 | 10438× | assert!( |
| 1029 | 10438× | !d.contains_key(node), |
| 1030 | | "file graph {} of a history-only state was not loaded (State::load_graphs)", |
| 1031 | 1× | node.short(12) |
| 1032 | | ); |
| 1033 | 16404× | } |
| 1034 | 26841× | self.files.get(node).map(|g| g.as_ref()) |
| 1035 | 26841× | } |
| 1036 | |
|
| 1037 | | |
| 1038 | 3236× | fn require_full(&self, what: &str) { |
| 1039 | 3236× | assert!( |
| 1040 | 3236× | self.is_full(), |
| 1041 | | "{what} needs every file graph; this state was loaded for history only" |
| 1042 | | ); |
| 1043 | 3235× | } |
| 1044 | |
|
| 1045 | | |
| 1046 | | |
| 1047 | | |
| 1048 | 4474× | pub fn load_graphs( |
| 1049 | 4474× | &mut self, |
| 1050 | 4474× | nodes: &[NodeId], |
| 1051 | 4474× | load: impl FnOnce(&[ObjectRef]) -> Result<Vec<Vec<u8>>, ObjectError>, |
| 1052 | 4474× | read_change: impl Fn(&ChangeHash) -> Result<Arc<Vec<u8>>, ObjectError>, |
| 1053 | 4474× | ) -> Result<(), ObjectError> { |
| 1054 | 4474× | let Some(deferred) = self.deferred.as_mut() else { |
| 1055 | 0× | return Ok(()); |
| 1056 | | }; |
| 1057 | 4474× | let taken: Vec<(NodeId, Deferred)> = nodes |
| 1058 | 4474× | .iter() |
| 1059 | 24074× | .filter_map(|n| deferred.remove(n).map(|d| (*n, Arc::unwrap_or_clone(d)))) |
| 1060 | 4474× | .collect(); |
| 1061 | 4474× | let built = build_deferred(taken, load, read_change)?; |
| 1062 | 4470× | self.files |
| 1063 | 23770× | .extend(built.into_iter().map(|(n, g)| (n, Arc::new(g)))); |
| 1064 | 4470× | Ok(()) |
| 1065 | 4474× | } |
| 1066 | |
|
| 1067 | | |
| 1068 | | |
| 1069 | | |
| 1070 | | |
| 1071 | | |
| 1072 | 77× | pub fn build_graphs_detached( |
| 1073 | 77× | &self, |
| 1074 | 77× | nodes: &[NodeId], |
| 1075 | 77× | load: impl FnOnce(&[ObjectRef]) -> Result<Vec<Vec<u8>>, ObjectError>, |
| 1076 | 77× | read_change: impl Fn(&ChangeHash) -> Result<Arc<Vec<u8>>, ObjectError>, |
| 1077 | 77× | ) -> Result<Vec<(NodeId, FileGraph)>, ObjectError> { |
| 1078 | 77× | let Some(deferred) = self.deferred.as_ref() else { |
| 1079 | 0× | return Ok(Vec::new()); |
| 1080 | | }; |
| 1081 | | |
| 1082 | | |
| 1083 | | |
| 1084 | | |
| 1085 | 77× | let mut built: Vec<(NodeId, FileGraph)> = Vec::new(); |
| 1086 | 77× | let mut copies: Vec<(NodeId, Deferred)> = Vec::new(); |
| 1087 | 77× | for n in nodes { |
| 1088 | 64× | match (self.files.get(n), deferred.get(n)) { |
| 1089 | 3× | (Some(g), _) => built.push((*n, (**g).clone())), |
| 1090 | 61× | (None, d) => copies.push((*n, d.map(|d| (**d).clone()).unwrap_or_default())), |
| 1091 | | } |
| 1092 | | } |
| 1093 | 77× | let mut out = build_deferred(copies, load, read_change)?; |
| 1094 | 77× | out.extend(built); |
| 1095 | 77× | Ok(out) |
| 1096 | 77× | } |
| 1097 | |
|
| 1098 | | |
| 1099 | | |
| 1100 | 64× | pub fn render_graph(&self, g: &FileGraph) -> (Vec<u8>, Materialized) { |
| 1101 | 64× | let m = g.materialize(self); |
| 1102 | 64× | let bytes = g.render(&m, &|h| self.label(h)); |
| 1103 | 64× | (bytes, m) |
| 1104 | 64× | } |
| 1105 | |
|
| 1106 | | |
| 1107 | | |
| 1108 | 79× | pub fn unbuilt_nodes(&self) -> Vec<NodeId> { |
| 1109 | 79× | self.deferred |
| 1110 | 79× | .as_ref() |
| 1111 | 79× | .map(|d| d.keys().copied().collect()) |
| 1112 | 79× | .unwrap_or_default() |
| 1113 | 79× | } |
| 1114 | |
|
| 1115 | | |
| 1116 | | |
| 1117 | | |
| 1118 | 492× | pub fn drop_graphs(&mut self, nodes: &[NodeId]) { |
| 1119 | 6086× | for n in nodes { |
| 1120 | 6086× | self.files.remove(n); |
| 1121 | 6086× | } |
| 1122 | 492× | } |
| 1123 | |
|
| 1124 | | |
| 1125 | 2324× | pub fn load_all_graphs( |
| 1126 | 2324× | &mut self, |
| 1127 | 2324× | load: impl FnOnce(&[ObjectRef]) -> Result<Vec<Vec<u8>>, ObjectError>, |
| 1128 | 2324× | read_change: impl Fn(&ChangeHash) -> Result<Arc<Vec<u8>>, ObjectError>, |
| 1129 | 2324× | ) -> Result<(), ObjectError> { |
| 1130 | 2324× | let nodes: Vec<NodeId> = match &self.deferred { |
| 1131 | 2324× | Some(d) => d.keys().copied().collect(), |
| 1132 | 0× | None => return Ok(()), |
| 1133 | | }; |
| 1134 | 2324× | self.load_graphs(&nodes, load, read_change)?; |
| 1135 | 2324× | self.deferred = None; |
| 1136 | 2324× | Ok(()) |
| 1137 | 2324× | } |
| 1138 | |
|
| 1139 | | |
| 1140 | | |
| 1141 | | |
| 1142 | | |
| 1143 | 5939× | pub fn single_text(&self, node: &NodeId) -> Option<TextRef> { |
| 1144 | 5939× | if self.files.contains_key(node) { |
| 1145 | 56× | return None; |
| 1146 | 5883× | } |
| 1147 | | |
| 1148 | | |
| 1149 | 5883× | let d = self.deferred.as_ref()?.get(node)?.body().ok()?; |
| 1150 | 5835× | let [(_, edits)] = d.edits.as_slice() else { |
| 1151 | 272× | return None; |
| 1152 | | }; |
| 1153 | | let [Edit::Insert { |
| 1154 | | after: AtomRef::Start, |
| 1155 | | before: AtomRef::End, |
| 1156 | 5563× | lines, |
| 1157 | | .. |
| 1158 | 5563× | }] = edits.as_slice() |
| 1159 | | else { |
| 1160 | 0× | return None; |
| 1161 | | }; |
| 1162 | 5563× | match (&d.base, d.texts.as_slice()) { |
| 1163 | 5563× | (None, [t]) if lines.is_empty() => Some(*t), |
| 1164 | 0× | _ => None, |
| 1165 | | } |
| 1166 | 5939× | } |
| 1167 | |
|
| 1168 | | |
| 1169 | | |
| 1170 | | |
| 1171 | | |
| 1172 | | |
| 1173 | | |
| 1174 | | |
| 1175 | 29057× | pub fn graph_key(&self, node: &NodeId) -> Option<[u8; 32]> { |
| 1176 | 29057× | let deferred = self.deferred.as_ref()?; |
| 1177 | 29014× | if self.files.contains_key(node) { |
| 1178 | 559× | return None; |
| 1179 | 28455× | } |
| 1180 | 28455× | let mut h = blake3::Hasher::new(); |
| 1181 | 28455× | h.update(b"oxy graph key 1\0"); |
| 1182 | | |
| 1183 | 28455× | h.update(&node.0); |
| 1184 | 28455× | let Some(d) = deferred.get(node) else { |
| 1185 | | |
| 1186 | 160× | h.update(&[0]); |
| 1187 | 160× | return Some(*h.finalize().as_bytes()); |
| 1188 | | }; |
| 1189 | | |
| 1190 | 28295× | if let Some(k) = d.key.get() { |
| 1191 | 22190× | return Some(*k); |
| 1192 | 6105× | } |
| 1193 | 6105× | let k = d.graph_key(h).ok()?; |
| 1194 | 6105× | Some(*d.key.get_or_init(|| k)) |
| 1195 | 29057× | } |
| 1196 | |
|
| 1197 | 4039× | pub fn len(&self) -> usize { |
| 1198 | 4039× | self.changes.len() |
| 1199 | 4039× | } |
| 1200 | |
|
| 1201 | | |
| 1202 | | |
| 1203 | | |
| 1204 | | |
| 1205 | | |
| 1206 | | |
| 1207 | | |
| 1208 | 1× | pub fn shed_graphs<E>( |
| 1209 | 1× | &mut self, |
| 1210 | 1× | mut store: impl FnMut(&[u8]) -> Result<ObjectRef, E>, |
| 1211 | 1× | ) -> Result<usize, E> { |
| 1212 | | use rayon::prelude::*; |
| 1213 | 1× | let Some(deferred) = self.deferred.as_mut() else { |
| 1214 | 0× | return Ok(0); |
| 1215 | | }; |
| 1216 | 1× | let graphs: Vec<(NodeId, Arc<FileGraph>)> = self.files.drain().collect(); |
| 1217 | 1× | let encoded: Vec<(NodeId, Vec<u8>)> = graphs |
| 1218 | 1× | .par_iter() |
| 1219 | 2× | .map(|(n, g)| (*n, cbor::encode(&g.to_value()))) |
| 1220 | 1× | .collect(); |
| 1221 | 1× | drop(graphs); |
| 1222 | 1× | let shed = encoded.len(); |
| 1223 | 2× | for (node, bytes) in encoded { |
| 1224 | 2× | let blob = store(&bytes)?; |
| 1225 | 2× | deferred.insert( |
| 1226 | 2× | node, |
| 1227 | 2× | Arc::new(Deferred::from_body(DeferredBody { |
| 1228 | 2× | base: Some(DeferredBase::Blob(blob)), |
| 1229 | 2× | ..DeferredBody::default() |
| 1230 | 2× | })), |
| 1231 | | ); |
| 1232 | | } |
| 1233 | 1× | Ok(shed) |
| 1234 | 1× | } |
| 1235 | |
|
| 1236 | | |
| 1237 | 77× | pub fn built_count(&self) -> usize { |
| 1238 | 77× | self.files.len() |
| 1239 | 77× | } |
| 1240 | |
|
| 1241 | | |
| 1242 | | |
| 1243 | 51× | pub fn built_atoms(&self) -> usize { |
| 1244 | 56× | self.files.values().map(|g| g.atom_count()).sum() |
| 1245 | 51× | } |
| 1246 | |
|
| 1247 | | |
| 1248 | | |
| 1249 | 0× | pub fn deferred_edit_count(&self) -> (usize, usize) { |
| 1250 | 0× | let Some(d) = self.deferred.as_ref() else { |
| 1251 | 0× | return (0, 0); |
| 1252 | | }; |
| 1253 | 0× | let mut total = 0; |
| 1254 | 0× | let mut most = 0; |
| 1255 | 0× | for v in d.values() { |
| 1256 | 0× | let n: usize = v |
| 1257 | 0× | .body() |
| 1258 | 0× | .map_or(0, |b| b.edits.iter().map(|(_, e)| e.len()).sum()); |
| 1259 | 0× | total += n; |
| 1260 | 0× | most = most.max(n); |
| 1261 | | } |
| 1262 | 0× | (total, most) |
| 1263 | 0× | } |
| 1264 | | } |
| 1265 | |
|
| 1266 | | impl Deferred { |
| 1267 | | |
| 1268 | 22422× | fn graph_key(&self, mut h: blake3::Hasher) -> Result<[u8; 32], ObjectError> { |
| 1269 | 22422× | let d = self.body()?; |
| 1270 | 18× | match &d.base { |
| 1271 | 22404× | None => h.update(&[0]), |
| 1272 | 0× | Some(DeferredBase::Blob(r)) => h.update(&[1]).update(&r.0), |
| 1273 | 18× | Some(DeferredBase::Inline(v)) => h.update(&[2]).update(&cbor::encode(v)), |
| 1274 | | }; |
| 1275 | 22422× | let mut changes: Vec<&ChangeHash> = d.edits.iter().map(|(c, _)| c).collect(); |
| 1276 | 22422× | changes.sort(); |
| 1277 | 22422× | changes.dedup(); |
| 1278 | 22422× | h.update(&(changes.len() as u64).to_le_bytes()); |
| 1279 | 23879× | for c in changes { |
| 1280 | 23879× | h.update(&c.0); |
| 1281 | 23879× | } |
| 1282 | 22422× | Ok(*h.finalize().as_bytes()) |
| 1283 | 22422× | } |
| 1284 | | } |
| 1285 | |
|
| 1286 | | impl State { |
| 1287 | 0× | pub fn is_empty(&self) -> bool { |
| 1288 | 0× | self.changes.is_empty() |
| 1289 | 0× | } |
| 1290 | 15080× | pub fn contains(&self, h: &ChangeHash) -> bool { |
| 1291 | 15080× | self.changes.contains_key(h) |
| 1292 | 15080× | } |
| 1293 | 71× | pub fn get(&self, h: &ChangeHash) -> Option<&ChangeMeta> { |
| 1294 | 71× | self.changes.get(h).map(|m| &**m) |
| 1295 | 71× | } |
| 1296 | 1882× | pub fn changes(&self) -> impl Iterator<Item = (&ChangeHash, &ChangeMeta)> { |
| 1297 | 4457× | self.changes.iter().map(|(h, m)| (h, &**m)) |
| 1298 | 1882× | } |
| 1299 | 15710× | pub fn tree(&self) -> &TreeGraph { |
| 1300 | 15710× | &self.tree |
| 1301 | 15710× | } |
| 1302 | |
|
| 1303 | | |
| 1304 | | |
| 1305 | | |
| 1306 | | |
| 1307 | | |
| 1308 | | |
| 1309 | 7212× | pub fn view(&self) -> TreeView { |
| 1310 | 7212× | if let Some(v) = self.unified_view.get() { |
| 1311 | 21× | return v.clone(); |
| 1312 | 7191× | } |
| 1313 | 7191× | let raw = self.tree.view(); |
| 1314 | 7191× | if !raw |
| 1315 | 7191× | .conflicts |
| 1316 | 7191× | .iter() |
| 1317 | 7191× | .any(|c| matches!(c, crate::tree::TreeConflict::Name { .. })) |
| 1318 | | { |
| 1319 | 6850× | return raw; |
| 1320 | 341× | } |
| 1321 | 344× | let (view, decided) = self.tree.unify(raw, |es| self.same_content(es)); |
| 1322 | 341× | if decided { |
| 1323 | 341× | let _ = self.unified_view.set(view.clone()); |
| 1324 | 341× | } |
| 1325 | 341× | view |
| 1326 | 7212× | } |
| 1327 | |
|
| 1328 | | |
| 1329 | | |
| 1330 | 2377× | pub fn unify_candidates(&self) -> Vec<NodeId> { |
| 1331 | 2377× | let Some(deferred) = &self.deferred else { |
| 1332 | 0× | return Vec::new(); |
| 1333 | | }; |
| 1334 | 2377× | if self.unified_view.get().is_some() { |
| 1335 | 0× | return Vec::new(); |
| 1336 | 2377× | } |
| 1337 | 2377× | let raw = self.tree.view(); |
| 1338 | 2377× | let mut out = Vec::new(); |
| 1339 | 2377× | for c in &raw.conflicts { |
| 1340 | 77× | if let crate::tree::TreeConflict::Name { nodes, .. } = c { |
| 1341 | 160× | out.extend(nodes.iter().filter(|n| deferred.contains_key(*n))); |
| 1342 | 0× | } |
| 1343 | | } |
| 1344 | 2377× | out |
| 1345 | 2377× | } |
| 1346 | |
|
| 1347 | | |
| 1348 | | |
| 1349 | | |
| 1350 | 344× | fn same_content(&self, entries: &[&crate::tree::TreeEntry]) -> Option<bool> { |
| 1351 | 714× | let text = |e: &crate::tree::TreeEntry| e.kind == NodeKind::File && !e.mode.opaque; |
| 1352 | 344× | let mut first: Option<Vec<u8>> = None; |
| 1353 | 344× | let mut first_blob: Option<ObjectRef> = None; |
| 1354 | 714× | for e in entries { |
| 1355 | 714× | if text(e) { |
| 1356 | 700× | if self |
| 1357 | 700× | .deferred |
| 1358 | 700× | .as_ref() |
| 1359 | 700× | .is_some_and(|d| d.contains_key(&e.node)) |
| 1360 | | { |
| 1361 | 0× | return None; |
| 1362 | 700× | } |
| 1363 | 700× | let (bytes, m) = self.render_file(&e.node); |
| 1364 | 700× | if m.is_conflicted() { |
| 1365 | 0× | return Some(false); |
| 1366 | 700× | } |
| 1367 | 363× | match &first { |
| 1368 | 337× | None => first = Some(bytes), |
| 1369 | 363× | Some(b) if *b == bytes => {} |
| 1370 | 185× | Some(_) => return Some(false), |
| 1371 | | } |
| 1372 | | } else { |
| 1373 | 14× | let [blob] = self.live_blobs(&e.node)[..] else { |
| 1374 | 0× | return Some(false); |
| 1375 | | }; |
| 1376 | 7× | match first_blob { |
| 1377 | 7× | None => first_blob = Some(blob), |
| 1378 | 7× | Some(b) if b == blob => {} |
| 1379 | 0× | Some(_) => return Some(false), |
| 1380 | | } |
| 1381 | | } |
| 1382 | | } |
| 1383 | 159× | Some(true) |
| 1384 | 344× | } |
| 1385 | 614× | pub fn file(&self, node: &NodeId) -> Option<&FileGraph> { |
| 1386 | 614× | self.graph(node) |
| 1387 | 614× | } |
| 1388 | |
|
| 1389 | | |
| 1390 | 2840× | pub fn add(&mut self, change: Change) -> Result<ChangeHash, StateError> { |
| 1391 | 2840× | let h = change.hash(); |
| 1392 | 2840× | self.add_hashed(h, change) |
| 1393 | 2840× | } |
| 1394 | |
|
| 1395 | | |
| 1396 | | |
| 1397 | 3599× | pub fn add_hashed(&mut self, h: ChangeHash, change: Change) -> Result<ChangeHash, StateError> { |
| 1398 | 3599× | if self.changes.contains_key(&h) { |
| 1399 | 44× | return Ok(h); |
| 1400 | 3555× | } |
| 1401 | 4985× | for d in &change.deps { |
| 1402 | 4985× | if !self.changes.contains_key(d) { |
| 1403 | 2× | return Err(StateError::MissingDep(*d, h)); |
| 1404 | 4983× | } |
| 1405 | | } |
| 1406 | 3553× | self.add_known(h, change, Vec::new()); |
| 1407 | 3553× | Ok(h) |
| 1408 | 3599× | } |
| 1409 | |
|
| 1410 | | |
| 1411 | 980× | pub fn add_unchecked(&mut self, change: Change) -> ChangeHash { |
| 1412 | 980× | let h = change.hash(); |
| 1413 | 980× | self.add_known(h, change, Vec::new()); |
| 1414 | 980× | h |
| 1415 | 980× | } |
| 1416 | |
|
| 1417 | | |
| 1418 | | |
| 1419 | | |
| 1420 | | |
| 1421 | | |
| 1422 | | |
| 1423 | 92× | pub fn add_known_mixed( |
| 1424 | 92× | &mut self, |
| 1425 | 92× | h: ChangeHash, |
| 1426 | 92× | full: Change, |
| 1427 | 92× | skeleton: Change, |
| 1428 | 92× | texts: Vec<TextRef>, |
| 1429 | 92× | ) { |
| 1430 | 92× | if self.deferred.is_none() || self.changes.contains_key(&h) { |
| 1431 | 0× | self.add_known(h, full, Vec::new()); |
| 1432 | 0× | return; |
| 1433 | 92× | } |
| 1434 | | let Change { |
| 1435 | 92× | version, |
| 1436 | 92× | change_id, |
| 1437 | 92× | deps, |
| 1438 | 92× | author, |
| 1439 | 92× | hlc, |
| 1440 | 92× | message, |
| 1441 | 92× | tree_ops, |
| 1442 | 92× | edits: full_edits, |
| 1443 | 92× | kind, |
| 1444 | 92× | } = full; |
| 1445 | 92× | let mut texts = texts.into_iter(); |
| 1446 | 92× | let mut edits = Vec::with_capacity(full_edits.len()); |
| 1447 | 92× | let mut kept = Vec::new(); |
| 1448 | 97× | for (f, s) in full_edits.into_iter().zip(skeleton.edits) { |
| 1449 | 97× | let text = match &s { |
| 1450 | 77× | Edit::Insert { lines, .. } if lines.is_empty() => texts.next(), |
| 1451 | 20× | _ => None, |
| 1452 | | }; |
| 1453 | 97× | if self.files.contains_key(&f.node()) { |
| 1454 | 45× | edits.push(f); |
| 1455 | 52× | } else { |
| 1456 | 52× | edits.push(s); |
| 1457 | 52× | kept.extend(text); |
| 1458 | 52× | } |
| 1459 | | } |
| 1460 | 92× | let c = Change { |
| 1461 | 92× | version, |
| 1462 | 92× | change_id, |
| 1463 | 92× | deps, |
| 1464 | 92× | author, |
| 1465 | 92× | hlc, |
| 1466 | 92× | message, |
| 1467 | 92× | tree_ops, |
| 1468 | 92× | edits, |
| 1469 | 92× | kind, |
| 1470 | 92× | }; |
| 1471 | 92× | self.add_known(h, c, kept); |
| 1472 | 92× | } |
| 1473 | |
|
| 1474 | | |
| 1475 | | |
| 1476 | | |
| 1477 | | |
| 1478 | | |
| 1479 | 13615× | pub fn add_known(&mut self, h: ChangeHash, change: Change, texts: Vec<TextRef>) { |
| 1480 | 13615× | if self.changes.contains_key(&h) { |
| 1481 | 0× | return; |
| 1482 | 13615× | } |
| 1483 | 13615× | let meta = ChangeMeta::of(&change); |
| 1484 | 13615× | self.unified_view = Default::default(); |
| 1485 | 13615× | self.apply_with(h, change, texts); |
| 1486 | 13615× | self.changes.insert(h, Arc::new(meta)); |
| 1487 | 13615× | { |
| 1488 | 13615× | let mut m = self.closure.write().unwrap(); |
| 1489 | 13615× | m.sets.clear(); |
| 1490 | 13615× | m.held = 0; |
| 1491 | 13615× | } |
| 1492 | 13615× | } |
| 1493 | |
|
| 1494 | | |
| 1495 | |
|
| 1496 | | |
| 1497 | | |
| 1498 | 380× | pub fn checkpoint_payload(&self) -> Vec<u8> { |
| 1499 | 380× | self.require_full("a checkpoint"); |
| 1500 | 380× | let mut nodes: Vec<&NodeId> = self.files.keys().collect(); |
| 1501 | 380× | nodes.sort(); |
| 1502 | 380× | let files = Value::Array( |
| 1503 | 380× | nodes |
| 1504 | 380× | .into_iter() |
| 1505 | 1495× | .map(|n| Value::Array(vec![Value::Bytes(n.0.to_vec()), self.files[n].to_value()])) |
| 1506 | 380× | .collect(), |
| 1507 | | ); |
| 1508 | 380× | cbor::encode(&self.payload_value(o::FORMAT_VERSION, files)) |
| 1509 | 380× | } |
| 1510 | |
|
| 1511 | | |
| 1512 | | |
| 1513 | 19× | pub fn checkpoint_file_graphs(&self) -> Vec<(NodeId, Vec<u8>)> { |
| 1514 | | use rayon::prelude::*; |
| 1515 | 19× | self.require_full("a checkpoint"); |
| 1516 | 19× | let mut nodes: Vec<(&NodeId, &FileGraph)> = |
| 1517 | 54× | self.files.iter().map(|(n, g)| (n, g.as_ref())).collect(); |
| 1518 | 19× | nodes.sort_by_key(|(n, _)| **n); |
| 1519 | 19× | nodes |
| 1520 | 19× | .into_par_iter() |
| 1521 | 54× | .map(|(n, g)| (*n, cbor::encode(&g.to_value()))) |
| 1522 | 19× | .collect() |
| 1523 | 19× | } |
| 1524 | |
|
| 1525 | | |
| 1526 | | |
| 1527 | | |
| 1528 | | |
| 1529 | 19× | pub fn checkpoint_index( |
| 1530 | 19× | &self, |
| 1531 | 19× | graphs: &[(NodeId, Vec<u8>)], |
| 1532 | 19× | mut blob_of: impl FnMut(&[u8]) -> ObjectRef, |
| 1533 | 19× | ) -> Vec<u8> { |
| 1534 | 19× | let files = Value::Array( |
| 1535 | 19× | graphs |
| 1536 | 19× | .iter() |
| 1537 | 54× | .map(|(n, enc)| { |
| 1538 | 54× | let entry = if enc.len() < INLINE_GRAPH_LIMIT { |
| 1539 | 47× | cbor::decode(enc).expect("an encoded graph decodes") |
| 1540 | | } else { |
| 1541 | 7× | Value::Bytes(blob_of(enc).0.to_vec()) |
| 1542 | | }; |
| 1543 | 54× | Value::Array(vec![Value::Bytes(n.0.to_vec()), entry]) |
| 1544 | 54× | }) |
| 1545 | 19× | .collect(), |
| 1546 | | ); |
| 1547 | 19× | cbor::encode(&self.payload_value(CHECKPOINT_INDEX_VERSION, files)) |
| 1548 | 19× | } |
| 1549 | |
|
| 1550 | | |
| 1551 | 399× | fn payload_value(&self, version: u64, files: Value) -> Value { |
| 1552 | 399× | let mut hashes: Vec<&ChangeHash> = self.changes.keys().collect(); |
| 1553 | 399× | hashes.sort(); |
| 1554 | 399× | let changes = Value::Array( |
| 1555 | 399× | hashes |
| 1556 | 399× | .into_iter() |
| 1557 | 2222× | .map(|h| { |
| 1558 | 2222× | let m = &self.changes[h]; |
| 1559 | 2222× | Value::Array(vec![ |
| 1560 | 2222× | Value::Bytes(h.0.to_vec()), |
| 1561 | 2222× | Value::Bytes(m.change_id.0.to_vec()), |
| 1562 | 2222× | Value::Array(m.deps.iter().map(|d| Value::Bytes(d.0.to_vec())).collect()), |
| 1563 | 2222× | Value::Text(m.message.clone()), |
| 1564 | 2222× | Value::Uint(m.hlc.wall_ms), |
| 1565 | 2222× | Value::Uint(m.hlc.logical as u64), |
| 1566 | 2222× | Value::Uint(m.kind.tag()), |
| 1567 | 2222× | Value::Bytes(m.author.0.to_vec()), |
| 1568 | | ]) |
| 1569 | 2222× | }) |
| 1570 | 399× | .collect(), |
| 1571 | | ); |
| 1572 | 399× | let mut rnodes: Vec<&NodeId> = self.replaces.keys().collect(); |
| 1573 | 399× | rnodes.sort(); |
| 1574 | 399× | let opt = |
| 1575 | 12× | |o: &Option<ObjectRef>| o.map(|r| Value::Bytes(r.0.to_vec())).unwrap_or(Value::Null); |
| 1576 | 399× | let replaces = Value::Array( |
| 1577 | 399× | rnodes |
| 1578 | 399× | .into_iter() |
| 1579 | 399× | .map(|n| { |
| 1580 | 6× | Value::Array(vec![ |
| 1581 | 6× | Value::Bytes(n.0.to_vec()), |
| 1582 | | Value::Array( |
| 1583 | 6× | self.replaces[n] |
| 1584 | 6× | .iter() |
| 1585 | 6× | .map(|(c, o, nw)| { |
| 1586 | 6× | Value::Array(vec![Value::Bytes(c.0.to_vec()), opt(o), opt(nw)]) |
| 1587 | 6× | }) |
| 1588 | 6× | .collect(), |
| 1589 | | ), |
| 1590 | | ]) |
| 1591 | 6× | }) |
| 1592 | 399× | .collect(), |
| 1593 | | ); |
| 1594 | 399× | Value::map([ |
| 1595 | 399× | (0, Value::Uint(version)), |
| 1596 | 399× | (1, changes), |
| 1597 | 399× | (2, self.tree.to_value()), |
| 1598 | 399× | (3, files), |
| 1599 | 399× | (4, replaces), |
| 1600 | 399× | ]) |
| 1601 | 399× | } |
| 1602 | |
|
| 1603 | | |
| 1604 | | |
| 1605 | 37× | pub fn from_checkpoint_payload(bytes: &[u8]) -> Result<State, ObjectError> { |
| 1606 | 37× | State::from_checkpoint(bytes, |_| { |
| 1607 | 1× | Err(ObjectError::Schema( |
| 1608 | 1× | "a version 2 checkpoint needs its graph blobs".into(), |
| 1609 | 1× | )) |
| 1610 | 1× | }) |
| 1611 | 37× | } |
| 1612 | |
|
| 1613 | | |
| 1614 | | |
| 1615 | | |
| 1616 | 60× | pub fn from_checkpoint( |
| 1617 | 60× | bytes: &[u8], |
| 1618 | 60× | load: impl FnOnce(&[ObjectRef]) -> Result<Vec<Vec<u8>>, ObjectError>, |
| 1619 | 60× | ) -> Result<State, ObjectError> { |
| 1620 | | use rayon::prelude::*; |
| 1621 | 60× | let v = cbor::decode(bytes)?; |
| 1622 | 59× | let m = o::map(&v, "checkpoint payload")?; |
| 1623 | 59× | let version = o::uint(o::field(m, 0, "version")?, "version")?; |
| 1624 | 59× | if version != o::FORMAT_VERSION && version != CHECKPOINT_INDEX_VERSION { |
| 1625 | 1× | return Err(ObjectError::Schema(format!( |
| 1626 | 1× | "checkpoint payload version {version} is not supported" |
| 1627 | 1× | ))); |
| 1628 | 58× | } |
| 1629 | 58× | let mut st = State::payload_common(m)?; |
| 1630 | 58× | let entries = o::array(o::field(m, 3, "files")?, "files")?; |
| 1631 | 58× | let mut parsed: Vec<(NodeId, &Value)> = Vec::with_capacity(entries.len()); |
| 1632 | 232× | for f in entries { |
| 1633 | 232× | let e = o::array(f, "file")?; |
| 1634 | 232× | if e.len() != 2 { |
| 1635 | 0× | return Err(ObjectError::Schema("file: expected [node, graph]".into())); |
| 1636 | 232× | } |
| 1637 | 232× | let node = NodeId::from_slice(o::bytes(&e[0], "node")?) |
| 1638 | 232× | .ok_or_else(|| ObjectError::Schema("node: expected 16 bytes".into()))?; |
| 1639 | 232× | parsed.push((node, &e[1])); |
| 1640 | | } |
| 1641 | | |
| 1642 | 58× | let mut fetched: HashMap<NodeId, Vec<u8>> = HashMap::new(); |
| 1643 | 58× | if version == CHECKPOINT_INDEX_VERSION { |
| 1644 | 20× | let wanted: Vec<(NodeId, ObjectRef)> = parsed |
| 1645 | 20× | .iter() |
| 1646 | 90× | .filter(|(_, e)| matches!(e, Value::Bytes(_))) |
| 1647 | 20× | .map(|(n, e)| Ok((*n, o::oref(e, "graph blob")?))) |
| 1648 | 20× | .collect::<Result<_, ObjectError>>()?; |
| 1649 | 20× | if !wanted.is_empty() { |
| 1650 | 7× | let refs: Vec<ObjectRef> = wanted.iter().map(|(_, r)| *r).collect(); |
| 1651 | 3× | let contents = { |
| 1652 | 7× | let _t = crate::timing::phase("load: graph blobs read"); |
| 1653 | 7× | load(&refs)? |
| 1654 | | }; |
| 1655 | 3× | if contents.len() != refs.len() { |
| 1656 | 0× | return Err(ObjectError::Schema("graph blobs: wrong count".into())); |
| 1657 | 3× | } |
| 1658 | 3× | fetched.extend(wanted.iter().map(|(n, _)| *n).zip(contents)); |
| 1659 | 13× | } |
| 1660 | 142× | } else if parsed.iter().any(|(_, e)| matches!(e, Value::Bytes(_))) { |
| 1661 | 0× | return Err(ObjectError::Schema( |
| 1662 | 0× | "a version 1 payload holds graphs inline".into(), |
| 1663 | 0× | )); |
| 1664 | 38× | } |
| 1665 | | |
| 1666 | 54× | let graphs = parsed |
| 1667 | 54× | .par_iter() |
| 1668 | 226× | .map(|(node, entry)| { |
| 1669 | 226× | let graph = match fetched.get(node) { |
| 1670 | 3× | Some(bytes) => FileGraph::from_value(&cbor::decode(bytes)?)?, |
| 1671 | 223× | None => FileGraph::from_value(entry)?, |
| 1672 | | }; |
| 1673 | 226× | Ok((*node, graph)) |
| 1674 | 226× | }) |
| 1675 | 54× | .collect::<Result<Vec<_>, ObjectError>>()?; |
| 1676 | 54× | st.files |
| 1677 | 226× | .extend(graphs.into_iter().map(|(n, g)| (n, Arc::new(g)))); |
| 1678 | 54× | Ok(st) |
| 1679 | 60× | } |
| 1680 | |
|
| 1681 | | |
| 1682 | 11× | pub fn checkpoint_graph_refs(bytes: &[u8]) -> Result<Vec<ObjectRef>, ObjectError> { |
| 1683 | 11× | let v = cbor::decode(bytes)?; |
| 1684 | 11× | let m = o::map(&v, "checkpoint payload")?; |
| 1685 | 11× | let mut out = Vec::new(); |
| 1686 | 29× | for f in o::array(o::field(m, 3, "files")?, "files")? { |
| 1687 | 29× | if let Some(entry @ Value::Bytes(_)) = o::array(f, "file")?.get(1) { |
| 1688 | 6× | out.push(o::oref(entry, "graph blob")?); |
| 1689 | 23× | } |
| 1690 | | } |
| 1691 | 11× | Ok(out) |
| 1692 | 11× | } |
| 1693 | |
|
| 1694 | | |
| 1695 | | |
| 1696 | | |
| 1697 | | |
| 1698 | 60× | pub fn from_checkpoint_history(bytes: &[u8]) -> Result<State, ObjectError> { |
| 1699 | 60× | let v = cbor::decode(bytes)?; |
| 1700 | 60× | let m = o::map(&v, "checkpoint payload")?; |
| 1701 | 60× | let version = o::uint(o::field(m, 0, "version")?, "version")?; |
| 1702 | 60× | if version != CHECKPOINT_INDEX_VERSION { |
| 1703 | 1× | return State::from_checkpoint_payload(bytes); |
| 1704 | 59× | } |
| 1705 | 59× | let mut st = State::payload_common(m)?; |
| 1706 | 59× | let mut deferred = crate::fasthash::FastMap::default(); |
| 1707 | 157× | for f in o::array(o::field(m, 3, "files")?, "files")? { |
| 1708 | 157× | let e = o::array(f, "file")?; |
| 1709 | 157× | if e.len() != 2 { |
| 1710 | 0× | return Err(ObjectError::Schema("file: expected [node, graph]".into())); |
| 1711 | 157× | } |
| 1712 | 157× | let node = NodeId::from_slice(o::bytes(&e[0], "node")?) |
| 1713 | 157× | .ok_or_else(|| ObjectError::Schema("node: expected 16 bytes".into()))?; |
| 1714 | 157× | let base = match &e[1] { |
| 1715 | 4× | Value::Bytes(_) => DeferredBase::Blob(o::oref(&e[1], "graph blob")?), |
| 1716 | 153× | other => DeferredBase::Inline(other.clone()), |
| 1717 | | }; |
| 1718 | 157× | deferred.insert( |
| 1719 | 157× | node, |
| 1720 | 157× | Arc::new(Deferred::from_body(DeferredBody { |
| 1721 | 157× | base: Some(base), |
| 1722 | 157× | ..DeferredBody::default() |
| 1723 | 157× | })), |
| 1724 | | ); |
| 1725 | | } |
| 1726 | 59× | st.deferred = Some(deferred); |
| 1727 | 59× | Ok(st) |
| 1728 | 60× | } |
| 1729 | |
|
| 1730 | | |
| 1731 | 117× | fn payload_common(m: &BTreeMap<u64, Value>) -> Result<State, ObjectError> { |
| 1732 | 117× | let mut st = State::new(); |
| 1733 | 541× | for c in o::array(o::field(m, 1, "changes")?, "changes")? { |
| 1734 | 541× | let e = o::array(c, "change meta")?; |
| 1735 | 541× | if e.len() != 8 { |
| 1736 | 0× | return Err(ObjectError::Schema("change meta: expected 8 fields".into())); |
| 1737 | 541× | } |
| 1738 | 541× | let hash = o::oref(&e[0], "hash")?; |
| 1739 | 541× | let meta = ChangeMeta { |
| 1740 | 541× | change_id: crate::ids::ChangeId::from_slice(o::bytes(&e[1], "change id")?) |
| 1741 | 541× | .ok_or_else(|| ObjectError::Schema("change id: expected 16 bytes".into()))?, |
| 1742 | 541× | deps: o::array(&e[2], "deps")? |
| 1743 | 541× | .iter() |
| 1744 | 636× | .map(|d| o::oref(d, "dep")) |
| 1745 | 541× | .collect::<Result<Vec<_>, _>>()?, |
| 1746 | 541× | message: o::text(&e[3], "message")?.to_owned(), |
| 1747 | | hlc: Hlc { |
| 1748 | 541× | wall_ms: o::uint(&e[4], "wall")?, |
| 1749 | 541× | logical: o::u32_(&e[5], "logical")?, |
| 1750 | | }, |
| 1751 | 541× | kind: ChangeKind::from_tag(o::uint(&e[6], "kind")?)?, |
| 1752 | 541× | author: o::oref(&e[7], "author")?, |
| 1753 | | }; |
| 1754 | 541× | st.changes.insert(hash, Arc::new(meta)); |
| 1755 | | } |
| 1756 | 117× | st.tree = TreeGraph::from_value(o::field(m, 2, "tree")?)?; |
| 1757 | 117× | let opt = |v: &Value| -> Result<Option<ObjectRef>, ObjectError> { |
| 1758 | 58× | if v.is_null() { |
| 1759 | 29× | Ok(None) |
| 1760 | | } else { |
| 1761 | 29× | o::oref(v, "blob").map(Some) |
| 1762 | | } |
| 1763 | 58× | }; |
| 1764 | 117× | for r in o::array(o::field(m, 4, "replaces")?, "replaces")? { |
| 1765 | 29× | let e = o::array(r, "replace")?; |
| 1766 | 29× | if e.len() != 2 { |
| 1767 | 0× | return Err(ObjectError::Schema( |
| 1768 | 0× | "replace: expected [node, records]".into(), |
| 1769 | 0× | )); |
| 1770 | 29× | } |
| 1771 | 29× | let node = NodeId::from_slice(o::bytes(&e[0], "node")?) |
| 1772 | 29× | .ok_or_else(|| ObjectError::Schema("node: expected 16 bytes".into()))?; |
| 1773 | 29× | let mut recs = Vec::new(); |
| 1774 | 29× | for rec in o::array(&e[1], "records")? { |
| 1775 | 29× | let x = o::array(rec, "record")?; |
| 1776 | 29× | if x.len() != 3 { |
| 1777 | 0× | return Err(ObjectError::Schema("record: expected 3 fields".into())); |
| 1778 | 29× | } |
| 1779 | 29× | recs.push((o::oref(&x[0], "change")?, opt(&x[1])?, opt(&x[2])?)); |
| 1780 | | } |
| 1781 | 29× | st.replaces.insert(node, recs); |
| 1782 | | } |
| 1783 | 117× | Ok(st) |
| 1784 | 117× | } |
| 1785 | |
|
| 1786 | 4105× | pub fn validate(&self) -> Result<(), StateError> { |
| 1787 | 10143× | for (h, c) in &self.changes { |
| 1788 | 10143× | for d in &c.deps { |
| 1789 | 5673× | if !self.changes.contains_key(d) { |
| 1790 | 0× | return Err(StateError::MissingDep(*d, *h)); |
| 1791 | 5673× | } |
| 1792 | | } |
| 1793 | | } |
| 1794 | 4105× | Ok(()) |
| 1795 | 4105× | } |
| 1796 | |
|
| 1797 | 13615× | fn apply_with(&mut self, h: ChangeHash, c: Change, texts: Vec<TextRef>) { |
| 1798 | 39578× | for (i, op) in c.tree_ops.iter().enumerate() { |
| 1799 | 39578× | self.tree.apply(h, i as u32, &resolve_tree_op(op, h)); |
| 1800 | 39578× | } |
| 1801 | 13615× | if let Some(deferred) = self.deferred.as_mut() { |
| 1802 | | |
| 1803 | | |
| 1804 | 8274× | let mut texts = texts.into_iter(); |
| 1805 | 8274× | let mut per_node: HashMap<NodeId, (Vec<Edit>, Vec<TextRef>)> = HashMap::new(); |
| 1806 | 39778× | for e in c.edits { |
| 1807 | 39778× | match e { |
| 1808 | 825× | Edit::Replace { node, old, new } => { |
| 1809 | 825× | self.replaces.entry(node).or_default().push((h, old, new)) |
| 1810 | | } |
| 1811 | 38953× | e => { |
| 1812 | 38953× | let slot = per_node.entry(e.node()).or_default(); |
| 1813 | 37139× | if matches!(&e, Edit::Insert { lines, .. } if lines.is_empty()) { |
| 1814 | 33454× | slot.1.extend(texts.next()); |
| 1815 | 33454× | } |
| 1816 | 38953× | slot.0.push(e); |
| 1817 | | } |
| 1818 | | } |
| 1819 | | } |
| 1820 | 36766× | for (node, (edits, node_texts)) in per_node { |
| 1821 | 36766× | match self.files.get_mut(&node) { |
| 1822 | 481× | Some(g) => { |
| 1823 | 481× | assert!( |
| 1824 | 481× | node_texts.is_empty(), |
| 1825 | | "a change read without its text applied to a built graph" |
| 1826 | | ); |
| 1827 | 481× | apply_file_edits(Arc::make_mut(g), h, edits) |
| 1828 | | } |
| 1829 | 36285× | None => { |
| 1830 | 36285× | let d = Arc::make_mut(deferred.entry(node).or_default()); |
| 1831 | 36285× | d.add(h, edits, node_texts); |
| 1832 | 36285× | d.key = Default::default(); |
| 1833 | 36285× | } |
| 1834 | | } |
| 1835 | | } |
| 1836 | 8274× | return; |
| 1837 | 5341× | } |
| 1838 | 5341× | assert!( |
| 1839 | 5341× | texts.is_empty(), |
| 1840 | | "a change read without its text applied to a full state" |
| 1841 | | ); |
| 1842 | 5341× | let mut counters: HashMap<NodeId, u32> = HashMap::new(); |
| 1843 | 6177× | for e in c.edits { |
| 1844 | 6177× | match e { |
| 1845 | | Edit::Insert { |
| 1846 | 4638× | node, |
| 1847 | 4638× | after, |
| 1848 | 4638× | before, |
| 1849 | 4638× | lines, |
| 1850 | 4638× | } => { |
| 1851 | 4638× | let idx = counters.entry(node).or_default(); |
| 1852 | 4638× | let first = *idx; |
| 1853 | 4638× | *idx += lines.len() as u32; |
| 1854 | 4638× | Arc::make_mut(self.files.entry(node).or_default()).insert_owned( |
| 1855 | 4638× | h, |
| 1856 | 4638× | first, |
| 1857 | 4638× | vertex(after.resolve(h)), |
| 1858 | 4638× | vertex(before.resolve(h)), |
| 1859 | 4638× | lines, |
| 1860 | 4638× | ); |
| 1861 | 4638× | } |
| 1862 | 1419× | Edit::Delete { node, atoms } => { |
| 1863 | 1419× | let g = Arc::make_mut(self.files.entry(node).or_default()); |
| 1864 | 1734× | for r in atoms { |
| 1865 | 1734× | g.delete(h, &r.resolve(h)); |
| 1866 | 1734× | } |
| 1867 | | } |
| 1868 | 120× | Edit::Replace { node, old, new } => { |
| 1869 | 120× | self.replaces.entry(node).or_default().push((h, old, new)); |
| 1870 | 120× | } |
| 1871 | | } |
| 1872 | | } |
| 1873 | 13615× | } |
| 1874 | |
|
| 1875 | | |
| 1876 | 9075× | pub fn closure(&self, h: &ChangeHash) -> Arc<HashSet<ChangeHash>> { |
| 1877 | 9075× | if let Some(c) = self.closure.read().unwrap().sets.get(h) { |
| 1878 | 7675× | return c.clone(); |
| 1879 | 1400× | } |
| 1880 | 1400× | let mut out = HashSet::new(); |
| 1881 | 1400× | let mut stack: Vec<ChangeHash> = self |
| 1882 | 1400× | .changes |
| 1883 | 1400× | .get(h) |
| 1884 | 1400× | .map(|c| c.deps.clone()) |
| 1885 | 1400× | .unwrap_or_default(); |
| 1886 | 16842× | while let Some(d) = stack.pop() { |
| 1887 | 15442× | if out.insert(d) { |
| 1888 | 10925× | if let Some(c) = self.changes.get(&d) { |
| 1889 | 10925× | stack.extend(c.deps.iter().copied()); |
| 1890 | 10925× | } |
| 1891 | 4517× | } |
| 1892 | | } |
| 1893 | 1400× | let rc = Arc::new(out); |
| 1894 | 1400× | let mut memo = self.closure.write().unwrap(); |
| 1895 | 1400× | if memo.held + rc.len() > CLOSURE_MEMO_HASHES { |
| 1896 | 0× | memo.sets.clear(); |
| 1897 | 0× | memo.held = 0; |
| 1898 | 1400× | } |
| 1899 | 1400× | memo.held += rc.len(); |
| 1900 | 1400× | memo.sets.insert(*h, rc.clone()); |
| 1901 | 1400× | rc |
| 1902 | 9075× | } |
| 1903 | |
|
| 1904 | | |
| 1905 | | |
| 1906 | | |
| 1907 | 380887× | fn level(&self, h: &ChangeHash) -> u32 { |
| 1908 | | |
| 1909 | | |
| 1910 | 380887× | if let Some(l) = self.levels.read().unwrap().get(h) { |
| 1911 | 378288× | return *l; |
| 1912 | 2599× | } |
| 1913 | 2599× | let mut levels = self.levels.write().unwrap(); |
| 1914 | 2599× | if let Some(l) = levels.get(h) { |
| 1915 | 17× | return *l; |
| 1916 | 2582× | } |
| 1917 | 2582× | let mut stack: Vec<(ChangeHash, bool)> = vec![(*h, false)]; |
| 1918 | 8671× | while let Some((c, expanded)) = stack.pop() { |
| 1919 | 6089× | if levels.contains_key(&c) { |
| 1920 | 45× | continue; |
| 1921 | 6044× | } |
| 1922 | 6044× | let deps: &[ChangeHash] = self |
| 1923 | 6044× | .changes |
| 1924 | 6044× | .get(&c) |
| 1925 | 6044× | .map(|m| m.deps.as_slice()) |
| 1926 | 6044× | .unwrap_or(&[]); |
| 1927 | 6044× | if expanded { |
| 1928 | 3022× | let l = deps |
| 1929 | 3022× | .iter() |
| 1930 | 3761× | .map(|d| levels.get(d).map_or(0, |l| l + 1)) |
| 1931 | 3022× | .max() |
| 1932 | 3022× | .unwrap_or(0); |
| 1933 | 3022× | levels.insert(c, l); |
| 1934 | | } else { |
| 1935 | 3022× | stack.push((c, true)); |
| 1936 | 3761× | for d in deps { |
| 1937 | 3761× | if !levels.contains_key(d) { |
| 1938 | 485× | stack.push((*d, false)); |
| 1939 | 3276× | } |
| 1940 | | } |
| 1941 | | } |
| 1942 | | } |
| 1943 | 2582× | levels[h] |
| 1944 | 380887× | } |
| 1945 | |
|
| 1946 | | |
| 1947 | 397× | pub fn heads(&self) -> Vec<ChangeHash> { |
| 1948 | 397× | let depended: crate::fasthash::FastSet<&ChangeHash> = |
| 1949 | 3390× | self.changes.values().flat_map(|c| c.deps.iter()).collect(); |
| 1950 | 397× | let mut heads: Vec<ChangeHash> = self |
| 1951 | 397× | .changes |
| 1952 | 397× | .keys() |
| 1953 | 3390× | .filter(|h| !depended.contains(h)) |
| 1954 | 397× | .copied() |
| 1955 | 397× | .collect(); |
| 1956 | 397× | heads.sort(); |
| 1957 | 397× | heads |
| 1958 | 397× | } |
| 1959 | |
|
| 1960 | | |
| 1961 | | |
| 1962 | | |
| 1963 | | |
| 1964 | | |
| 1965 | 10352× | pub fn maximal(&self, hashes: &[ChangeHash]) -> Vec<ChangeHash> { |
| 1966 | 10352× | let set: BTreeSet<ChangeHash> = hashes.iter().copied().collect(); |
| 1967 | 10352× | let mut below: crate::fasthash::FastSet<ChangeHash> = Default::default(); |
| 1968 | 10352× | let mut stack: Vec<ChangeHash> = set |
| 1969 | 10352× | .iter() |
| 1970 | 17609× | .filter_map(|h| self.changes.get(h)) |
| 1971 | 14909× | .flat_map(|c| c.deps.iter().copied()) |
| 1972 | 10352× | .collect(); |
| 1973 | 23561× | while let Some(d) = stack.pop() { |
| 1974 | 13209× | if below.insert(d) { |
| 1975 | 6676× | if let Some(c) = self.changes.get(&d) { |
| 1976 | 6676× | stack.extend(c.deps.iter().copied()); |
| 1977 | 6676× | } |
| 1978 | 6533× | } |
| 1979 | | } |
| 1980 | 17609× | set.into_iter().filter(|h| !below.contains(h)).collect() |
| 1981 | 10352× | } |
| 1982 | |
|
| 1983 | 0× | pub fn materialize_file(&self, node: &NodeId) -> Materialized { |
| 1984 | 0× | self.graph(node) |
| 1985 | 0× | .map(|g| g.materialize(self)) |
| 1986 | 0× | .unwrap_or_default() |
| 1987 | 0× | } |
| 1988 | |
|
| 1989 | | |
| 1990 | 21× | pub fn live_lines(&self, node: &NodeId) -> Vec<(AtomKey, Vec<u8>)> { |
| 1991 | 21× | let Some(g) = self.graph(node) else { |
| 1992 | 2× | return vec![]; |
| 1993 | | }; |
| 1994 | 19× | let m = g.materialize(self); |
| 1995 | 19× | m.live_atoms() |
| 1996 | 19× | .into_iter() |
| 1997 | 45× | .map(|a| (a, g.content(&a).unwrap_or_default().to_vec())) |
| 1998 | 19× | .collect() |
| 1999 | 21× | } |
| 2000 | |
|
| 2001 | | |
| 2002 | 4× | pub fn opaque_nodes(&self) -> Vec<NodeId> { |
| 2003 | 4× | let mut nodes: Vec<NodeId> = self.replaces.keys().copied().collect(); |
| 2004 | 4× | nodes.sort(); |
| 2005 | 4× | nodes |
| 2006 | 4× | } |
| 2007 | |
|
| 2008 | | |
| 2009 | 1051× | pub fn live_blobs(&self, node: &NodeId) -> Vec<ObjectRef> { |
| 2010 | 1051× | let mut live: Vec<ObjectRef> = self |
| 2011 | 1051× | .live_replaces(node) |
| 2012 | 1051× | .into_iter() |
| 2013 | 1051× | .map(|(_, n)| n) |
| 2014 | 1051× | .collect(); |
| 2015 | 1051× | live.sort(); |
| 2016 | 1051× | live.dedup(); |
| 2017 | 1051× | live |
| 2018 | 1051× | } |
| 2019 | |
|
| 2020 | | |
| 2021 | | |
| 2022 | | |
| 2023 | | |
| 2024 | | |
| 2025 | | |
| 2026 | | |
| 2027 | | |
| 2028 | 1111× | pub fn live_replaces(&self, node: &NodeId) -> Vec<(ChangeHash, ObjectRef)> { |
| 2029 | 1111× | let Some(rs) = self.replaces.get(node) else { |
| 2030 | 0× | return vec![]; |
| 2031 | | }; |
| 2032 | | |
| 2033 | | |
| 2034 | | |
| 2035 | 1111× | let dep = |
| 2036 | 253× | |a: &ChangeHash, b: &ChangeHash| a != b && <Self as DepOracle>::depends_on(self, a, b); |
| 2037 | 1111× | let knows_its_old = |s: &ChangeHash, old: &ObjectRef| { |
| 2038 | 11× | rs.iter() |
| 2039 | 20× | .any(|(q, _, n)| n.as_ref() == Some(old) && q != s && dep(s, q)) |
| 2040 | 11× | }; |
| 2041 | 1111× | rs.iter() |
| 2042 | 1408× | .filter_map(|(c, _, n)| n.map(|n| (*c, n))) |
| 2043 | 1408× | .filter(|(c, n)| { |
| 2044 | 2012× | !rs.iter().any(|(s, o, _)| { |
| 2045 | 2012× | s != c && *o == Some(*n) && (dep(s, c) || (!knows_its_old(s, n) && !dep(c, s))) |
| 2046 | 2012× | }) |
| 2047 | 1408× | }) |
| 2048 | 1111× | .collect() |
| 2049 | 1111× | } |
| 2050 | |
|
| 2051 | | |
| 2052 | 1003× | pub fn label(&self, h: &ChangeHash) -> String { |
| 2053 | 1003× | match self.changes.get(h) { |
| 2054 | 1003× | Some(c) => format!( |
| 2055 | | "{} \"{}\"", |
| 2056 | 1003× | c.change_id.short(8), |
| 2057 | 1003× | c.message.lines().next().unwrap_or("") |
| 2058 | | ), |
| 2059 | 0× | None => format!("#{}", h.short(12)), |
| 2060 | | } |
| 2061 | 1003× | } |
| 2062 | |
|
| 2063 | | |
| 2064 | | |
| 2065 | | |
| 2066 | | |
| 2067 | | |
| 2068 | 5× | pub fn blob_contributors(&self, node: &NodeId, blobs: &[ObjectRef]) -> Vec<ChangeHash> { |
| 2069 | 5× | let mut out: Vec<ChangeHash> = Vec::new(); |
| 2070 | 15× | for (h, _, new) in self.replaces.get(node).map(|v| v.as_slice()).unwrap_or(&[]) { |
| 2071 | 15× | if new.is_some_and(|b| blobs.contains(&b)) && !out.contains(h) { |
| 2072 | 10× | out.push(*h); |
| 2073 | 10× | } |
| 2074 | | } |
| 2075 | 5× | out.sort(); |
| 2076 | 5× | out |
| 2077 | 5× | } |
| 2078 | |
|
| 2079 | 46× | pub fn conflict_regions(&self, node: &NodeId) -> ConflictRegions { |
| 2080 | 46× | let mut out = ConflictRegions::default(); |
| 2081 | 46× | let Some(g) = self.graph(node) else { |
| 2082 | 0× | return out; |
| 2083 | | }; |
| 2084 | 46× | let m = g.materialize(self); |
| 2085 | 46× | let mut contributors = BTreeSet::new(); |
| 2086 | 119× | for seg in &m.segments { |
| 2087 | 119× | match seg { |
| 2088 | 73× | crate::graph::Segment::Lines(atoms) => { |
| 2089 | 97× | for a in atoms { |
| 2090 | 97× | out.plain |
| 2091 | 97× | .push((*a, g.content(a).unwrap_or_default().to_vec())); |
| 2092 | 97× | } |
| 2093 | | } |
| 2094 | 46× | crate::graph::Segment::Conflict(sides) => { |
| 2095 | 92× | for side in sides { |
| 2096 | 94× | for a in side { |
| 2097 | 94× | out.region_atoms.push(*a); |
| 2098 | 94× | contributors.insert(a.0); |
| 2099 | 94× | } |
| 2100 | | } |
| 2101 | | } |
| 2102 | 0× | crate::graph::Segment::Zombie { deleted, inserted } => { |
| 2103 | 0× | for a in deleted { |
| 2104 | 0× | contributors.insert(a.0); |
| 2105 | 0× | contributors.extend(g.deleters(a).copied()); |
| 2106 | 0× | } |
| 2107 | 0× | for a in inserted { |
| 2108 | 0× | out.region_atoms.push(*a); |
| 2109 | 0× | contributors.insert(a.0); |
| 2110 | 0× | } |
| 2111 | | } |
| 2112 | | } |
| 2113 | | } |
| 2114 | 46× | out.contributors = contributors.into_iter().collect(); |
| 2115 | 46× | out |
| 2116 | 46× | } |
| 2117 | |
|
| 2118 | | |
| 2119 | | |
| 2120 | | |
| 2121 | | |
| 2122 | 25607× | fn materialize_ordered(&self, g: &FileGraph) -> Materialized { |
| 2123 | 25607× | let mut m = g.materialize(self); |
| 2124 | 25607× | let when = |h: &ChangeHash| match self.changes.get(h) { |
| 2125 | 688× | Some(c) => (false, c.hlc, *h), |
| 2126 | 0× | None => (true, Default::default(), *h), |
| 2127 | 688× | }; |
| 2128 | 26171× | for seg in &mut m.segments { |
| 2129 | 26171× | if let crate::graph::Segment::Conflict(sides) = seg { |
| 2130 | 688× | sides.sort_by_cached_key(|s| s.iter().map(|a| when(&a.0)).min()); |
| 2131 | 25865× | } |
| 2132 | | } |
| 2133 | 25607× | m |
| 2134 | 25607× | } |
| 2135 | |
|
| 2136 | | |
| 2137 | | |
| 2138 | | |
| 2139 | | |
| 2140 | 6× | pub fn both_sides(&self, node: &NodeId) -> Vec<Option<Vec<Vec<u8>>>> { |
| 2141 | 6× | let Some(g) = self.graph(node) else { |
| 2142 | 0× | return Vec::new(); |
| 2143 | | }; |
| 2144 | 6× | let m = self.materialize_ordered(g); |
| 2145 | 6× | let mut out = Vec::new(); |
| 2146 | 18× | for (i, seg) in m.segments.iter().enumerate() { |
| 2147 | 6× | match seg { |
| 2148 | 12× | crate::graph::Segment::Lines(_) => {} |
| 2149 | 6× | crate::graph::Segment::Conflict(sides) if g.adjacent_insertion(&m, i, self) => { |
| 2150 | 4× | out.push(Some( |
| 2151 | 4× | sides |
| 2152 | 4× | .iter() |
| 2153 | 8× | .map(|s| { |
| 2154 | 8× | s.iter() |
| 2155 | 8× | .flat_map(|a| g.content(a).unwrap_or_default().to_vec()) |
| 2156 | 8× | .collect() |
| 2157 | 8× | }) |
| 2158 | 4× | .collect(), |
| 2159 | | )); |
| 2160 | | } |
| 2161 | 2× | _ => out.push(None), |
| 2162 | | } |
| 2163 | | } |
| 2164 | 6× | out |
| 2165 | 6× | } |
| 2166 | |
|
| 2167 | 26155× | pub fn render_file(&self, node: &NodeId) -> (Vec<u8>, Materialized) { |
| 2168 | 26155× | let Some(g) = self.graph(node) else { |
| 2169 | 553× | return (Vec::new(), Materialized::default()); |
| 2170 | | }; |
| 2171 | 25602× | let m = self.materialize_ordered(g); |
| 2172 | 25602× | let bytes = g.render(&m, &|h| self.label(h)); |
| 2173 | 25602× | (bytes, m) |
| 2174 | 26155× | } |
| 2175 | |
|
| 2176 | | |
| 2177 | | |
| 2178 | 2837× | pub fn materialize(&self) -> Snapshot { |
| 2179 | | use rayon::prelude::*; |
| 2180 | 2837× | self.require_full("materializing a state"); |
| 2181 | 2837× | let tree = self.view(); |
| 2182 | 2837× | let entries: Vec<(&String, &crate::tree::TreeEntry)> = tree.entries.iter().collect(); |
| 2183 | 2837× | let rendered: Vec<(String, FileState)> = entries |
| 2184 | 2837× | .par_iter() |
| 2185 | 17583× | .map(|(path, e)| (path.to_string(), self.file_state(e))) |
| 2186 | 2837× | .collect(); |
| 2187 | 2837× | let files: BTreeMap<String, FileState> = rendered.into_iter().collect(); |
| 2188 | 2837× | Snapshot { |
| 2189 | 2837× | tree, |
| 2190 | 2837× | files, |
| 2191 | 2837× | unrendered: BTreeSet::new(), |
| 2192 | 2837× | } |
| 2193 | 2837× | } |
| 2194 | |
|
| 2195 | | |
| 2196 | | |
| 2197 | | |
| 2198 | | |
| 2199 | | |
| 2200 | | |
| 2201 | | |
| 2202 | 20× | pub fn materialize_except(&self, skip: &HashSet<NodeId>) -> Snapshot { |
| 2203 | 20× | self.materialize_leaving(self.tree.view(), |_, e| skip.contains(&e.node)) |
| 2204 | 20× | } |
| 2205 | |
|
| 2206 | | |
| 2207 | | |
| 2208 | | |
| 2209 | 1011× | pub fn materialize_only(&self, render: &std::collections::HashSet<&str>) -> Snapshot { |
| 2210 | 7956× | self.materialize_leaving(self.view(), |p, _| !render.contains(p)) |
| 2211 | 1011× | } |
| 2212 | |
|
| 2213 | | |
| 2214 | | |
| 2215 | | |
| 2216 | 234× | pub fn materialize_nodes(&self, render: &HashSet<NodeId>) -> Snapshot { |
| 2217 | 604× | self.materialize_leaving(self.view(), |_, e| !render.contains(&e.node)) |
| 2218 | 234× | } |
| 2219 | |
|
| 2220 | 1265× | fn materialize_leaving( |
| 2221 | 1265× | &self, |
| 2222 | 1265× | tree: TreeView, |
| 2223 | 1265× | leave: impl Fn(&str, &crate::tree::TreeEntry) -> bool + Sync, |
| 2224 | 1265× | ) -> Snapshot { |
| 2225 | | use rayon::prelude::*; |
| 2226 | 1265× | let entries: Vec<(&String, &crate::tree::TreeEntry)> = tree.entries.iter().collect(); |
| 2227 | 1265× | let rendered: Vec<(String, FileState, bool)> = entries |
| 2228 | 1265× | .par_iter() |
| 2229 | 8939× | .map(|(path, e)| { |
| 2230 | 8939× | if e.kind == NodeKind::File && !e.mode.opaque && leave(path, e) { |
| 2231 | 4590× | let f = FileState { |
| 2232 | 4590× | node: e.node, |
| 2233 | 4590× | kind: e.kind, |
| 2234 | 4590× | mode: e.mode, |
| 2235 | 4590× | content: FileContent::Text { |
| 2236 | 4590× | bytes: Vec::new(), |
| 2237 | 4590× | materialized: Materialized::default(), |
| 2238 | 4590× | }, |
| 2239 | 4590× | }; |
| 2240 | 4590× | (path.to_string(), f, true) |
| 2241 | | } else { |
| 2242 | 4349× | (path.to_string(), self.file_state(e), false) |
| 2243 | | } |
| 2244 | 8939× | }) |
| 2245 | 1265× | .collect(); |
| 2246 | | |
| 2247 | 1265× | let unrendered: BTreeSet<String> = rendered |
| 2248 | 1265× | .iter() |
| 2249 | 1265× | .filter(|(_, _, skipped)| *skipped) |
| 2250 | 4590× | .map(|(p, _, _)| p.clone()) |
| 2251 | 1265× | .collect(); |
| 2252 | 1265× | let files: BTreeMap<String, FileState> = |
| 2253 | 8939× | rendered.into_iter().map(|(p, f, _)| (p, f)).collect(); |
| 2254 | 1265× | Snapshot { |
| 2255 | 1265× | tree, |
| 2256 | 1265× | files, |
| 2257 | 1265× | unrendered, |
| 2258 | 1265× | } |
| 2259 | 1265× | } |
| 2260 | |
|
| 2261 | | |
| 2262 | | |
| 2263 | | |
| 2264 | 90× | pub fn materialize_paths<'p>( |
| 2265 | 90× | &self, |
| 2266 | 90× | view: crate::tree::TreeView, |
| 2267 | 90× | paths: impl IntoIterator<Item = &'p str>, |
| 2268 | 90× | ) -> Snapshot { |
| 2269 | | use rayon::prelude::*; |
| 2270 | | |
| 2271 | 90× | let entries: Vec<(&str, &crate::tree::TreeEntry)> = paths |
| 2272 | 90× | .into_iter() |
| 2273 | 131× | .filter_map(|p| Some((p, view.entries.get(p)?))) |
| 2274 | 90× | .collect(); |
| 2275 | 90× | let files = entries |
| 2276 | 90× | .par_iter() |
| 2277 | 107× | .map(|(p, e)| (p.to_string(), self.file_state(e))) |
| 2278 | 90× | .collect::<Vec<_>>() |
| 2279 | 90× | .into_iter() |
| 2280 | 90× | .collect(); |
| 2281 | 90× | Snapshot { |
| 2282 | 90× | tree: view, |
| 2283 | 90× | files, |
| 2284 | 90× | unrendered: BTreeSet::new(), |
| 2285 | 90× | } |
| 2286 | 90× | } |
| 2287 | |
|
| 2288 | | |
| 2289 | | |
| 2290 | 0× | pub fn entry_state(&self, e: &crate::tree::TreeEntry) -> FileState { |
| 2291 | 0× | self.file_state(e) |
| 2292 | 0× | } |
| 2293 | |
|
| 2294 | 22039× | fn file_state(&self, e: &crate::tree::TreeEntry) -> FileState { |
| 2295 | | { |
| 2296 | 22039× | let content = match e.kind { |
| 2297 | 1544× | NodeKind::Dir => FileContent::Dir, |
| 2298 | 167× | NodeKind::Symlink | NodeKind::Subrepo => FileContent::Opaque { |
| 2299 | 167× | blobs: self.live_blobs(&e.node), |
| 2300 | 167× | }, |
| 2301 | 612× | NodeKind::File if e.mode.opaque => FileContent::Opaque { |
| 2302 | 612× | blobs: self.live_blobs(&e.node), |
| 2303 | 612× | }, |
| 2304 | | NodeKind::File => { |
| 2305 | 19716× | let (bytes, materialized) = self.render_file(&e.node); |
| 2306 | 19716× | FileContent::Text { |
| 2307 | 19716× | bytes, |
| 2308 | 19716× | materialized, |
| 2309 | 19716× | } |
| 2310 | | } |
| 2311 | | }; |
| 2312 | 22039× | FileState { |
| 2313 | 22039× | node: e.node, |
| 2314 | 22039× | kind: e.kind, |
| 2315 | 22039× | mode: e.mode, |
| 2316 | 22039× | content, |
| 2317 | 22039× | } |
| 2318 | | } |
| 2319 | 22039× | } |
| 2320 | | } |
| 2321 | |
|
| 2322 | | impl DepOracle for State { |
| 2323 | | |
| 2324 | | |
| 2325 | | |
| 2326 | | |
| 2327 | 66595× | fn depends_on(&self, a: &ChangeHash, b: &ChangeHash) -> bool { |
| 2328 | 66595× | if a == b { |
| 2329 | 802× | return true; |
| 2330 | 65793× | } |
| 2331 | 65793× | if let Some(c) = self.closure.read().unwrap().sets.get(a) { |
| 2332 | 0× | return c.contains(b); |
| 2333 | 65793× | } |
| 2334 | 65793× | if !self.changes.contains_key(b) { |
| 2335 | 800× | return false; |
| 2336 | 64993× | } |
| 2337 | 64993× | let lb = self.level(b); |
| 2338 | 64993× | if self.level(a) <= lb { |
| 2339 | 35886× | return false; |
| 2340 | 29107× | } |
| 2341 | 29107× | let mut seen: crate::fasthash::FastSet<ChangeHash> = Default::default(); |
| 2342 | | |
| 2343 | | |
| 2344 | | |
| 2345 | | |
| 2346 | | |
| 2347 | | |
| 2348 | 29107× | let mut stack: Vec<ChangeHash> = self |
| 2349 | 29107× | .changes |
| 2350 | 29107× | .get(a) |
| 2351 | 29107× | .map(|m| m.deps.clone()) |
| 2352 | 29107× | .unwrap_or_default(); |
| 2353 | 29107× | if stack.contains(b) { |
| 2354 | 3098× | return true; |
| 2355 | 26009× | } |
| 2356 | 323775× | while let Some(c) = stack.pop() { |
| 2357 | 304477× | if c == *b { |
| 2358 | 0× | return true; |
| 2359 | 304477× | } |
| 2360 | 304477× | if !seen.insert(c) || self.level(&c) <= lb { |
| 2361 | 203614× | continue; |
| 2362 | 100863× | } |
| 2363 | 100863× | if let Some(m) = self.changes.get(&c) { |
| 2364 | 100863× | if m.deps.contains(b) { |
| 2365 | 6711× | return true; |
| 2366 | 94152× | } |
| 2367 | 94152× | stack.extend(m.deps.iter().copied()); |
| 2368 | 0× | } |
| 2369 | | } |
| 2370 | 19298× | false |
| 2371 | 66595× | } |
| 2372 | | } |
| 2373 | |
|
| 2374 | | #[cfg(test)] |
| 2375 | | mod tests { |
| 2376 | | use super::*; |
| 2377 | |
|
| 2378 | | |
| 2379 | | |
| 2380 | | #[test] |
| 2381 | 1× | fn a_long_changes_block_decodes_in_order() { |
| 2382 | | use crate::flat::Writer; |
| 2383 | 1× | let metas: Vec<(ChangeHash, ChangeMeta)> = (0..5000u32) |
| 2384 | 5000× | .map(|i| { |
| 2385 | 5000× | let mut h = [0u8; 32]; |
| 2386 | 5000× | h[..4].copy_from_slice(&i.to_le_bytes()); |
| 2387 | 5000× | let meta = ChangeMeta { |
| 2388 | 5000× | change_id: crate::ids::ChangeId([i as u8; 16]), |
| 2389 | 5000× | deps: (0..i % 3).map(|d| ObjectRef([d as u8; 32])).collect(), |
| 2390 | 5000× | author: ObjectRef([7; 32]), |
| 2391 | 5000× | hlc: Hlc { |
| 2392 | 5000× | wall_ms: 1_000_000 - i as u64, |
| 2393 | 5000× | logical: i, |
| 2394 | 5000× | }, |
| 2395 | 5000× | message: "x".repeat((i % 50) as usize), |
| 2396 | 5000× | kind: ChangeKind::Normal, |
| 2397 | | }; |
| 2398 | 5000× | (ObjectRef(h), meta) |
| 2399 | 5000× | }) |
| 2400 | 1× | .collect(); |
| 2401 | 1× | let mut w = Writer::default(); |
| 2402 | 1× | w.fixed(State::INDEX_MAGIC); |
| 2403 | 1× | w.count(metas.len()); |
| 2404 | 5000× | for (h, m) in &metas { |
| 2405 | 5000× | w.object(h); |
| 2406 | 5000× | m.write_flat(&mut w); |
| 2407 | 5000× | } |
| 2408 | 1× | assert_eq!(State::read_index_changes_listed(&w.0).unwrap(), metas); |
| 2409 | 1× | let mut cut = w.0.clone(); |
| 2410 | 1× | cut.pop(); |
| 2411 | 1× | assert!( |
| 2412 | 1× | State::read_index_changes_listed(&cut).is_err(), |
| 2413 | | "a truncated block is refused" |
| 2414 | | ); |
| 2415 | 1× | } |
| 2416 | | use crate::ids::ChangeId; |
| 2417 | | use crate::objects::{AtomRange, ChangeKind, Hlc, OpRef}; |
| 2418 | |
|
| 2419 | 2023× | fn change(deps: Vec<ChangeHash>, tree_ops: Vec<TreeOp>, edits: Vec<Edit>) -> Change { |
| 2420 | 2023× | let mut c = Change { |
| 2421 | 2023× | version: crate::objects::CHANGE_VERSION, |
| 2422 | 2023× | change_id: ChangeId::random(), |
| 2423 | 2023× | deps, |
| 2424 | 2023× | author: ObjectRef::ZERO, |
| 2425 | 2023× | hlc: Hlc { |
| 2426 | 2023× | wall_ms: 1, |
| 2427 | 2023× | logical: 0, |
| 2428 | 2023× | }, |
| 2429 | 2023× | message: "m".into(), |
| 2430 | 2023× | tree_ops, |
| 2431 | 2023× | edits, |
| 2432 | 2023× | kind: ChangeKind::Normal, |
| 2433 | 2023× | }; |
| 2434 | 2023× | c.normalize(); |
| 2435 | 2023× | c |
| 2436 | 2023× | } |
| 2437 | |
|
| 2438 | | #[test] |
| 2439 | 1× | fn build_edit_and_materialize() { |
| 2440 | 1× | let mut st = State::new(); |
| 2441 | 1× | let f = NodeId::random(); |
| 2442 | 1× | let c1 = change( |
| 2443 | 1× | vec![], |
| 2444 | 1× | vec![TreeOp::AddNode { |
| 2445 | 1× | node: f, |
| 2446 | 1× | kind: NodeKind::File, |
| 2447 | 1× | mode: Mode::TEXT, |
| 2448 | 1× | parent: NodeId::ROOT, |
| 2449 | 1× | name: "a.txt".into(), |
| 2450 | 1× | }], |
| 2451 | 1× | vec![Edit::Insert { |
| 2452 | 1× | node: f, |
| 2453 | 1× | after: AtomRef::Start, |
| 2454 | 1× | before: AtomRef::End, |
| 2455 | 1× | lines: vec![b"one\n".to_vec(), b"two\n".to_vec()].into(), |
| 2456 | 1× | }], |
| 2457 | | ); |
| 2458 | 1× | let h1 = st.add(c1).unwrap(); |
| 2459 | | |
| 2460 | 1× | let c2 = change( |
| 2461 | 1× | vec![h1], |
| 2462 | 1× | vec![], |
| 2463 | 1× | vec![ |
| 2464 | 1× | Edit::Delete { |
| 2465 | 1× | node: f, |
| 2466 | 1× | atoms: vec![AtomRange { |
| 2467 | 1× | change: h1, |
| 2468 | 1× | from: 0, |
| 2469 | 1× | to: 1, |
| 2470 | 1× | }], |
| 2471 | 1× | }, |
| 2472 | 1× | Edit::Insert { |
| 2473 | 1× | node: f, |
| 2474 | 1× | after: AtomRef::Atom { |
| 2475 | 1× | change: h1, |
| 2476 | 1× | index: 1, |
| 2477 | 1× | }, |
| 2478 | 1× | before: AtomRef::End, |
| 2479 | 1× | lines: vec![b"three\n".to_vec()].into(), |
| 2480 | 1× | }, |
| 2481 | | ], |
| 2482 | | ); |
| 2483 | 1× | let h2 = st.add(c2).unwrap(); |
| 2484 | 1× | assert_eq!(st.heads(), vec![h2]); |
| 2485 | 1× | assert!(st.depends_on(&h2, &h1)); |
| 2486 | 1× | assert!(!st.depends_on(&h1, &h2)); |
| 2487 | 1× | let snap = st.materialize(); |
| 2488 | 1× | assert!(!snap.is_conflicted()); |
| 2489 | 1× | let a = &snap.files["a.txt"]; |
| 2490 | 1× | assert!(matches!(&a.content, FileContent::Text { bytes, .. } if bytes == b"two\nthree\n")); |
| 2491 | 1× | assert_eq!(st.live_lines(&f).len(), 2); |
| 2492 | 1× | } |
| 2493 | |
|
| 2494 | | #[test] |
| 2495 | 1× | fn missing_dependency_is_rejected() { |
| 2496 | 1× | let mut st = State::new(); |
| 2497 | 1× | let c = change(vec![ObjectRef([1; 32])], vec![], vec![]); |
| 2498 | 1× | assert!(matches!(st.add(c), Err(StateError::MissingDep(..)))); |
| 2499 | 1× | } |
| 2500 | |
|
| 2501 | | #[test] |
| 2502 | 1× | fn self_references_and_multi_insert_indexing() { |
| 2503 | 1× | let mut st = State::new(); |
| 2504 | 1× | let f = NodeId::random(); |
| 2505 | 1× | let me = OpRef { |
| 2506 | 1× | change: ObjectRef::ZERO, |
| 2507 | 1× | index: 0, |
| 2508 | 1× | }; |
| 2509 | 1× | let c1 = change( |
| 2510 | 1× | vec![], |
| 2511 | 1× | vec![ |
| 2512 | 1× | TreeOp::AddNode { |
| 2513 | 1× | node: f, |
| 2514 | 1× | kind: NodeKind::File, |
| 2515 | 1× | mode: Mode::TEXT, |
| 2516 | 1× | parent: NodeId::ROOT, |
| 2517 | 1× | name: "x".into(), |
| 2518 | 1× | }, |
| 2519 | 1× | TreeOp::SetMode { |
| 2520 | 1× | node: f, |
| 2521 | 1× | old: me, |
| 2522 | 1× | mode: Mode { |
| 2523 | 1× | exec: true, |
| 2524 | 1× | opaque: false, |
| 2525 | 1× | }, |
| 2526 | 1× | }, |
| 2527 | | ], |
| 2528 | 1× | vec![ |
| 2529 | 1× | Edit::Insert { |
| 2530 | 1× | node: f, |
| 2531 | 1× | after: AtomRef::Start, |
| 2532 | 1× | before: AtomRef::End, |
| 2533 | 1× | lines: vec![b"a\n".to_vec(), b"c\n".to_vec()].into(), |
| 2534 | 1× | }, |
| 2535 | | |
| 2536 | 1× | Edit::Insert { |
| 2537 | 1× | node: f, |
| 2538 | 1× | after: AtomRef::Atom { |
| 2539 | 1× | change: ObjectRef::ZERO, |
| 2540 | 1× | index: 0, |
| 2541 | 1× | }, |
| 2542 | 1× | before: AtomRef::Atom { |
| 2543 | 1× | change: ObjectRef::ZERO, |
| 2544 | 1× | index: 1, |
| 2545 | 1× | }, |
| 2546 | 1× | lines: vec![b"b\n".to_vec()].into(), |
| 2547 | 1× | }, |
| 2548 | | ], |
| 2549 | | ); |
| 2550 | 1× | st.add(c1).unwrap(); |
| 2551 | 1× | let snap = st.materialize(); |
| 2552 | 1× | let x = &snap.files["x"]; |
| 2553 | 1× | assert_eq!( |
| 2554 | | x.mode, |
| 2555 | | Mode { |
| 2556 | | exec: true, |
| 2557 | | opaque: false |
| 2558 | | } |
| 2559 | | ); |
| 2560 | 1× | assert!(matches!(&x.content, FileContent::Text { bytes, .. } if bytes == b"a\nb\nc\n")); |
| 2561 | 1× | } |
| 2562 | |
|
| 2563 | | #[test] |
| 2564 | 1× | fn opaque_replace_and_conflict() { |
| 2565 | 1× | let mut st = State::new(); |
| 2566 | 1× | let f = NodeId::random(); |
| 2567 | 1× | let b1 = ObjectRef([1; 32]); |
| 2568 | 1× | let b2 = ObjectRef([2; 32]); |
| 2569 | 1× | let b3 = ObjectRef([3; 32]); |
| 2570 | 1× | let h1 = st |
| 2571 | 1× | .add(change( |
| 2572 | 1× | vec![], |
| 2573 | 1× | vec![TreeOp::AddNode { |
| 2574 | 1× | node: f, |
| 2575 | 1× | kind: NodeKind::File, |
| 2576 | 1× | mode: Mode::OPAQUE, |
| 2577 | 1× | parent: NodeId::ROOT, |
| 2578 | 1× | name: "img".into(), |
| 2579 | 1× | }], |
| 2580 | 1× | vec![Edit::Replace { |
| 2581 | 1× | node: f, |
| 2582 | 1× | old: None, |
| 2583 | 1× | new: Some(b1), |
| 2584 | 1× | }], |
| 2585 | | )) |
| 2586 | 1× | .unwrap(); |
| 2587 | 1× | assert_eq!(st.live_blobs(&f), vec![b1]); |
| 2588 | 1× | st.add(change( |
| 2589 | 1× | vec![h1], |
| 2590 | 1× | vec![], |
| 2591 | 1× | vec![Edit::Replace { |
| 2592 | 1× | node: f, |
| 2593 | 1× | old: Some(b1), |
| 2594 | 1× | new: Some(b2), |
| 2595 | 1× | }], |
| 2596 | | )) |
| 2597 | 1× | .unwrap(); |
| 2598 | 1× | st.add(change( |
| 2599 | 1× | vec![h1], |
| 2600 | 1× | vec![], |
| 2601 | 1× | vec![Edit::Replace { |
| 2602 | 1× | node: f, |
| 2603 | 1× | old: Some(b1), |
| 2604 | 1× | new: Some(b3), |
| 2605 | 1× | }], |
| 2606 | | )) |
| 2607 | 1× | .unwrap(); |
| 2608 | 1× | let snap = st.materialize(); |
| 2609 | 1× | assert!(snap.is_conflicted()); |
| 2610 | 1× | assert!( |
| 2611 | 1× | matches!(&snap.files["img"].content, FileContent::Opaque { blobs } if blobs == &vec![b2, b3]) |
| 2612 | | ); |
| 2613 | 1× | } |
| 2614 | |
|
| 2615 | | #[test] |
| 2616 | 1× | fn checkpoint_payload_round_trip_and_replay() { |
| 2617 | 1× | let mut st = State::new(); |
| 2618 | 1× | let f = NodeId::random(); |
| 2619 | 1× | let h1 = st |
| 2620 | 1× | .add(change( |
| 2621 | 1× | vec![], |
| 2622 | 1× | vec![TreeOp::AddNode { |
| 2623 | 1× | node: f, |
| 2624 | 1× | kind: NodeKind::File, |
| 2625 | 1× | mode: Mode::TEXT, |
| 2626 | 1× | parent: NodeId::ROOT, |
| 2627 | 1× | name: "a".into(), |
| 2628 | 1× | }], |
| 2629 | 1× | vec![Edit::Insert { |
| 2630 | 1× | node: f, |
| 2631 | 1× | after: AtomRef::Start, |
| 2632 | 1× | before: AtomRef::End, |
| 2633 | 1× | lines: vec![b"1\n".to_vec(), b"2\n".to_vec()].into(), |
| 2634 | 1× | }], |
| 2635 | | )) |
| 2636 | 1× | .unwrap(); |
| 2637 | 1× | let h2 = st |
| 2638 | 1× | .add(change( |
| 2639 | 1× | vec![h1], |
| 2640 | 1× | vec![], |
| 2641 | 1× | vec![Edit::Delete { |
| 2642 | 1× | node: f, |
| 2643 | 1× | atoms: vec![AtomRange { |
| 2644 | 1× | change: h1, |
| 2645 | 1× | from: 0, |
| 2646 | 1× | to: 1, |
| 2647 | 1× | }], |
| 2648 | 1× | }], |
| 2649 | | )) |
| 2650 | 1× | .unwrap(); |
| 2651 | 1× | let payload = st.checkpoint_payload(); |
| 2652 | 1× | let back = State::from_checkpoint_payload(&payload).unwrap(); |
| 2653 | 1× | assert_eq!(back.len(), 2); |
| 2654 | 1× | assert_eq!(back.heads(), vec![h2]); |
| 2655 | 1× | assert_eq!(back.get(&h1).unwrap().message, "m"); |
| 2656 | 1× | assert_eq!(back.checkpoint_payload(), payload, "deterministic"); |
| 2657 | | |
| 2658 | 1× | let c3 = change( |
| 2659 | 1× | vec![h2], |
| 2660 | 1× | vec![], |
| 2661 | 1× | vec![Edit::Insert { |
| 2662 | 1× | node: f, |
| 2663 | 1× | after: AtomRef::Atom { |
| 2664 | 1× | change: h1, |
| 2665 | 1× | index: 1, |
| 2666 | 1× | }, |
| 2667 | 1× | before: AtomRef::End, |
| 2668 | 1× | lines: vec![b"3\n".to_vec()].into(), |
| 2669 | 1× | }], |
| 2670 | | ); |
| 2671 | 1× | let mut full = st.clone(); |
| 2672 | 1× | full.add(c3.clone()).unwrap(); |
| 2673 | 1× | let mut restored = back; |
| 2674 | 1× | restored.add(c3).unwrap(); |
| 2675 | 1× | let (a, b) = (full.materialize(), restored.materialize()); |
| 2676 | 1× | assert_eq!( |
| 2677 | 1× | a.files.keys().collect::<Vec<_>>(), |
| 2678 | 1× | b.files.keys().collect::<Vec<_>>() |
| 2679 | | ); |
| 2680 | 1× | assert_eq!(a.files["a"].content, b.files["a"].content); |
| 2681 | 1× | assert!( |
| 2682 | 1× | matches!(&b.files["a"].content, FileContent::Text { bytes, .. } if bytes == b"2\n3\n") |
| 2683 | | ); |
| 2684 | 1× | assert!(State::from_checkpoint_payload(b"nonsense").is_err()); |
| 2685 | 1× | } |
| 2686 | |
|
| 2687 | | |
| 2688 | | |
| 2689 | | |
| 2690 | | #[test] |
| 2691 | 1× | fn graph_keys_change_exactly_when_a_graph_does() { |
| 2692 | 1× | let (f, g) = (NodeId::random(), NodeId::random()); |
| 2693 | 1× | let add = |node: NodeId, name: &str| TreeOp::AddNode { |
| 2694 | 2× | node, |
| 2695 | 2× | kind: NodeKind::File, |
| 2696 | | mode: Mode::TEXT, |
| 2697 | | parent: NodeId::ROOT, |
| 2698 | 2× | name: name.into(), |
| 2699 | 2× | }; |
| 2700 | 1× | let ins = |node: NodeId, line: &[u8]| Edit::Insert { |
| 2701 | 4× | node, |
| 2702 | 4× | after: AtomRef::Start, |
| 2703 | 4× | before: AtomRef::End, |
| 2704 | 4× | lines: vec![line.to_vec()].into(), |
| 2705 | 4× | }; |
| 2706 | 1× | let c1 = change( |
| 2707 | 1× | vec![], |
| 2708 | 1× | vec![add(f, "f"), add(g, "g")], |
| 2709 | 1× | vec![ins(f, b"f\n"), ins(g, b"g\n")], |
| 2710 | | ); |
| 2711 | 1× | let h1 = c1.hash(); |
| 2712 | 1× | let c2 = change(vec![h1], vec![], vec![ins(g, b"g2\n")]); |
| 2713 | 1× | let h2 = c2.hash(); |
| 2714 | 1× | let c3 = change(vec![h2], vec![], vec![ins(f, b"f2\n")]); |
| 2715 | 6× | let load = |cs: &[&Change]| { |
| 2716 | 6× | let mut st = State::new_history_only(); |
| 2717 | 10× | for c in cs { |
| 2718 | 10× | st.add((*c).clone()).unwrap(); |
| 2719 | 10× | } |
| 2720 | 6× | st |
| 2721 | 6× | }; |
| 2722 | 1× | let s1 = load(&[&c1]); |
| 2723 | 1× | let s2 = load(&[&c1, &c2]); |
| 2724 | 1× | let s3 = load(&[&c1, &c2, &c3]); |
| 2725 | 18× | let key = |s: &State, n: &NodeId| s.graph_key(n).unwrap(); |
| 2726 | 1× | assert_eq!(key(&s1, &f), key(&load(&[&c1]), &f), "same state, same key"); |
| 2727 | 1× | assert_eq!(key(&s1, &f), key(&s2, &f), "an edit elsewhere keeps it"); |
| 2728 | 1× | assert_ne!(key(&s1, &g), key(&s2, &g), "an edit of the file changes it"); |
| 2729 | 1× | assert_ne!(key(&s2, &f), key(&s3, &f)); |
| 2730 | 1× | assert_ne!(key(&s1, &f), key(&s1, &g), "different files differ"); |
| 2731 | 1× | let mut built = load(&[&c1]); |
| 2732 | 1× | built |
| 2733 | 1× | .load_graphs(&[f], |_| unreachable!(), |_| unreachable!()) |
| 2734 | 1× | .unwrap(); |
| 2735 | 1× | assert!(built.graph_key(&f).is_none(), "a built graph has no key"); |
| 2736 | 1× | let mut full = State::new(); |
| 2737 | 1× | full.add(c1.clone()).unwrap(); |
| 2738 | 1× | assert!(full.graph_key(&f).is_none(), "nor has a full state"); |
| 2739 | |
|
| 2740 | | |
| 2741 | | |
| 2742 | 1× | let graphs = full.checkpoint_file_graphs(); |
| 2743 | 1× | let index = full.checkpoint_index(&graphs, |enc| { |
| 2744 | 0× | crate::hash::hash_object(crate::hash::ObjectType::Blob, enc) |
| 2745 | 0× | }); |
| 2746 | 8× | let cp = |extra: &[&Change]| { |
| 2747 | 8× | let mut st = State::from_checkpoint_history(&index).unwrap(); |
| 2748 | 8× | for c in extra { |
| 2749 | 5× | st.add((*c).clone()).unwrap(); |
| 2750 | 5× | } |
| 2751 | 8× | st |
| 2752 | 8× | }; |
| 2753 | 1× | assert_eq!(key(&cp(&[]), &f), key(&cp(&[]), &f)); |
| 2754 | 1× | assert_eq!(key(&cp(&[]), &f), key(&cp(&[&c2]), &f)); |
| 2755 | 1× | assert_ne!(key(&cp(&[]), &g), key(&cp(&[&c2]), &g)); |
| 2756 | 1× | assert_ne!(key(&cp(&[&c2]), &f), key(&cp(&[&c2, &c3]), &f)); |
| 2757 | |
|
| 2758 | | |
| 2759 | | |
| 2760 | 1× | let mut part = load(&[&c1, &c2]); |
| 2761 | 1× | part.load_graphs(&[g], |_| unreachable!(), |_| unreachable!()) |
| 2762 | 1× | .unwrap(); |
| 2763 | 1× | let snap = part.materialize_except(&[f].into_iter().collect()); |
| 2764 | 1× | assert_eq!(snap.unrendered, ["f".to_string()].into_iter().collect()); |
| 2765 | 1× | let mut whole = State::new(); |
| 2766 | 1× | whole.add(c1.clone()).unwrap(); |
| 2767 | 1× | whole.add(c2.clone()).unwrap(); |
| 2768 | 1× | assert_eq!(snap.files["g"], whole.materialize().files["g"]); |
| 2769 | 1× | assert!( |
| 2770 | 1× | matches!(&snap.files["f"].content, FileContent::Text { bytes, .. } if bytes.is_empty()) |
| 2771 | | ); |
| 2772 | 1× | } |
| 2773 | |
|
| 2774 | | #[test] |
| 2775 | 1× | fn history_only_states_build_the_same_graphs_on_demand() { |
| 2776 | 1× | let small = NodeId::random(); |
| 2777 | 1× | let big = NodeId::random(); |
| 2778 | 1× | let add = |node: NodeId, name: &str| TreeOp::AddNode { |
| 2779 | 2× | node, |
| 2780 | 2× | kind: NodeKind::File, |
| 2781 | | mode: Mode::TEXT, |
| 2782 | | parent: NodeId::ROOT, |
| 2783 | 2× | name: name.into(), |
| 2784 | 2× | }; |
| 2785 | 1× | let lines: crate::lines::Lines = (0..300) |
| 2786 | 300× | .map(|i| format!("line {i}\n").into_bytes()) |
| 2787 | 1× | .collect(); |
| 2788 | 1× | let c1 = change( |
| 2789 | 1× | vec![], |
| 2790 | 1× | vec![add(small, "small"), add(big, "big")], |
| 2791 | 1× | vec![ |
| 2792 | 1× | Edit::Insert { |
| 2793 | 1× | node: small, |
| 2794 | 1× | after: AtomRef::Start, |
| 2795 | 1× | before: AtomRef::End, |
| 2796 | 1× | lines: vec![b"x\n".to_vec()].into(), |
| 2797 | 1× | }, |
| 2798 | 1× | Edit::Insert { |
| 2799 | 1× | node: big, |
| 2800 | 1× | after: AtomRef::Start, |
| 2801 | 1× | before: AtomRef::End, |
| 2802 | 1× | lines, |
| 2803 | 1× | }, |
| 2804 | | ], |
| 2805 | | ); |
| 2806 | 1× | let h1 = c1.hash(); |
| 2807 | 1× | let c2 = change( |
| 2808 | 1× | vec![h1], |
| 2809 | 1× | vec![], |
| 2810 | 1× | vec![ |
| 2811 | 1× | Edit::Delete { |
| 2812 | 1× | node: big, |
| 2813 | 1× | atoms: vec![AtomRange { |
| 2814 | 1× | change: h1, |
| 2815 | 1× | from: 2, |
| 2816 | 1× | to: 9, |
| 2817 | 1× | }], |
| 2818 | 1× | }, |
| 2819 | 1× | Edit::Insert { |
| 2820 | 1× | node: big, |
| 2821 | 1× | after: AtomRef::Atom { |
| 2822 | 1× | change: h1, |
| 2823 | 1× | index: 20, |
| 2824 | 1× | }, |
| 2825 | 1× | before: AtomRef::Atom { |
| 2826 | 1× | change: h1, |
| 2827 | 1× | index: 21, |
| 2828 | 1× | }, |
| 2829 | 1× | lines: vec![b"new a\n".to_vec(), b"new b\n".to_vec()].into(), |
| 2830 | 1× | }, |
| 2831 | 1× | Edit::Insert { |
| 2832 | 1× | node: small, |
| 2833 | 1× | after: AtomRef::Atom { |
| 2834 | 1× | change: h1, |
| 2835 | 1× | index: 0, |
| 2836 | 1× | }, |
| 2837 | 1× | before: AtomRef::End, |
| 2838 | 1× | lines: vec![b"y\n".to_vec()].into(), |
| 2839 | 1× | }, |
| 2840 | | ], |
| 2841 | | ); |
| 2842 | 1× | let h2 = c2.hash(); |
| 2843 | 1× | let c3 = change( |
| 2844 | 1× | vec![h2], |
| 2845 | 1× | vec![], |
| 2846 | 1× | vec![Edit::Delete { |
| 2847 | 1× | node: small, |
| 2848 | 1× | atoms: vec![AtomRange { |
| 2849 | 1× | change: h1, |
| 2850 | 1× | from: 0, |
| 2851 | 1× | to: 1, |
| 2852 | 1× | }], |
| 2853 | 1× | }], |
| 2854 | | ); |
| 2855 | |
|
| 2856 | 1× | let mut full = State::new(); |
| 2857 | 3× | for c in [&c1, &c2, &c3] { |
| 2858 | 3× | full.add(c.clone()).unwrap(); |
| 2859 | 3× | } |
| 2860 | | |
| 2861 | 1× | let mut hist = State::new_history_only(); |
| 2862 | 3× | for c in [&c1, &c2, &c3] { |
| 2863 | 3× | hist.add(c.clone()).unwrap(); |
| 2864 | 3× | } |
| 2865 | 1× | assert!(!hist.is_full() && hist.files.is_empty(), "no graph built"); |
| 2866 | 1× | assert_eq!(hist.len(), 3); |
| 2867 | 1× | hist.load_graphs( |
| 2868 | 1× | &[big], |
| 2869 | 0× | |_| unreachable!("no checkpoint"), |
| 2870 | 0× | |_| unreachable!(), |
| 2871 | | ) |
| 2872 | 1× | .unwrap(); |
| 2873 | 1× | assert_eq!( |
| 2874 | 1× | hist.render_file(&big).0, |
| 2875 | 1× | full.render_file(&big).0, |
| 2876 | | "one file on its own" |
| 2877 | | ); |
| 2878 | 1× | assert!(!hist.is_full()); |
| 2879 | 1× | hist.load_graphs(&[small, big], |_| unreachable!(), |_| unreachable!()) |
| 2880 | 1× | .unwrap(); |
| 2881 | 1× | assert!(hist.is_full()); |
| 2882 | 1× | assert_eq!(hist.checkpoint_payload(), full.checkpoint_payload()); |
| 2883 | |
|
| 2884 | | |
| 2885 | 1× | let mut base = State::new(); |
| 2886 | 1× | base.add(c1.clone()).unwrap(); |
| 2887 | 1× | base.add(c2.clone()).unwrap(); |
| 2888 | 1× | let graphs = base.checkpoint_file_graphs(); |
| 2889 | 1× | let mut blobs: HashMap<ObjectRef, Vec<u8>> = HashMap::new(); |
| 2890 | 1× | let index = base.checkpoint_index(&graphs, |enc| { |
| 2891 | 1× | let r = crate::hash::hash_object(crate::hash::ObjectType::Blob, enc); |
| 2892 | 1× | blobs.insert(r, enc.to_vec()); |
| 2893 | 1× | r |
| 2894 | 1× | }); |
| 2895 | 1× | let mut from_cp = State::from_checkpoint_history(&index).unwrap(); |
| 2896 | 1× | from_cp.add(c3.clone()).unwrap(); |
| 2897 | 1× | assert!(!from_cp.is_full()); |
| 2898 | 1× | let mut fetched = 0; |
| 2899 | 1× | from_cp |
| 2900 | 1× | .load_graphs( |
| 2901 | 1× | &[small, big], |
| 2902 | 1× | |refs| { |
| 2903 | 1× | fetched += refs.len(); |
| 2904 | 1× | refs.iter() |
| 2905 | 1× | .map(|r| { |
| 2906 | 1× | blobs |
| 2907 | 1× | .get(r) |
| 2908 | 1× | .cloned() |
| 2909 | 1× | .ok_or_else(|| ObjectError::Schema("missing".into())) |
| 2910 | 1× | }) |
| 2911 | 1× | .collect() |
| 2912 | 1× | }, |
| 2913 | 0× | |_| unreachable!(), |
| 2914 | | ) |
| 2915 | 1× | .unwrap(); |
| 2916 | 1× | assert_eq!( |
| 2917 | | fetched, 1, |
| 2918 | | "the large graph's blob, in one batch; the small one was inline" |
| 2919 | | ); |
| 2920 | 1× | assert_eq!(from_cp.checkpoint_payload(), full.checkpoint_payload()); |
| 2921 | 1× | } |
| 2922 | |
|
| 2923 | | #[test] |
| 2924 | | #[should_panic(expected = "was not loaded")] |
| 2925 | 1× | fn a_history_only_state_never_reads_an_unloaded_graph_as_empty() { |
| 2926 | 1× | let f = NodeId::random(); |
| 2927 | 1× | let mut st = State::new_history_only(); |
| 2928 | 1× | st.add(change( |
| 2929 | 1× | vec![], |
| 2930 | 1× | vec![TreeOp::AddNode { |
| 2931 | 1× | node: f, |
| 2932 | 1× | kind: NodeKind::File, |
| 2933 | 1× | mode: Mode::TEXT, |
| 2934 | 1× | parent: NodeId::ROOT, |
| 2935 | 1× | name: "a".into(), |
| 2936 | 1× | }], |
| 2937 | 1× | vec![Edit::Insert { |
| 2938 | 1× | node: f, |
| 2939 | 1× | after: AtomRef::Start, |
| 2940 | 1× | before: AtomRef::End, |
| 2941 | 1× | lines: vec![b"a\n".to_vec()].into(), |
| 2942 | 1× | }], |
| 2943 | | )) |
| 2944 | 1× | .unwrap(); |
| 2945 | 1× | st.render_file(&f); |
| 2946 | 1× | } |
| 2947 | |
|
| 2948 | | #[test] |
| 2949 | | #[should_panic(expected = "needs every file graph")] |
| 2950 | 1× | fn materializing_a_history_only_state_is_refused() { |
| 2951 | 1× | let f = NodeId::random(); |
| 2952 | 1× | let mut st = State::new_history_only(); |
| 2953 | 1× | st.add(change( |
| 2954 | 1× | vec![], |
| 2955 | 1× | vec![TreeOp::AddNode { |
| 2956 | 1× | node: f, |
| 2957 | 1× | kind: NodeKind::File, |
| 2958 | 1× | mode: Mode::TEXT, |
| 2959 | 1× | parent: NodeId::ROOT, |
| 2960 | 1× | name: "a".into(), |
| 2961 | 1× | }], |
| 2962 | 1× | vec![Edit::Insert { |
| 2963 | 1× | node: f, |
| 2964 | 1× | after: AtomRef::Start, |
| 2965 | 1× | before: AtomRef::End, |
| 2966 | 1× | lines: vec![b"a\n".to_vec()].into(), |
| 2967 | 1× | }], |
| 2968 | | )) |
| 2969 | 1× | .unwrap(); |
| 2970 | 1× | st.materialize(); |
| 2971 | 1× | } |
| 2972 | |
|
| 2973 | | |
| 2974 | | |
| 2975 | | #[test] |
| 2976 | 1× | fn checkpoint_index_round_trip_matches_version_1() { |
| 2977 | 1× | let mut st = State::new(); |
| 2978 | 1× | let small = NodeId::random(); |
| 2979 | 1× | let big = NodeId::random(); |
| 2980 | 1× | let add = |node: NodeId, name: &str| TreeOp::AddNode { |
| 2981 | 2× | node, |
| 2982 | 2× | kind: NodeKind::File, |
| 2983 | | mode: Mode::TEXT, |
| 2984 | | parent: NodeId::ROOT, |
| 2985 | 2× | name: name.into(), |
| 2986 | 2× | }; |
| 2987 | 1× | let big_lines: crate::lines::Lines = (0..400) |
| 2988 | 400× | .map(|i| format!("line {i} of a long file\n").into_bytes()) |
| 2989 | 1× | .collect(); |
| 2990 | 1× | let h1 = st |
| 2991 | 1× | .add(change( |
| 2992 | 1× | vec![], |
| 2993 | 1× | vec![add(small, "small"), add(big, "big")], |
| 2994 | 1× | vec![ |
| 2995 | 1× | Edit::Insert { |
| 2996 | 1× | node: small, |
| 2997 | 1× | after: AtomRef::Start, |
| 2998 | 1× | before: AtomRef::End, |
| 2999 | 1× | lines: vec![b"x\n".to_vec()].into(), |
| 3000 | 1× | }, |
| 3001 | 1× | Edit::Insert { |
| 3002 | 1× | node: big, |
| 3003 | 1× | after: AtomRef::Start, |
| 3004 | 1× | before: AtomRef::End, |
| 3005 | 1× | lines: big_lines, |
| 3006 | 1× | }, |
| 3007 | | ], |
| 3008 | | )) |
| 3009 | 1× | .unwrap(); |
| 3010 | 1× | st.add(change( |
| 3011 | 1× | vec![h1], |
| 3012 | 1× | vec![], |
| 3013 | 1× | vec![Edit::Delete { |
| 3014 | 1× | node: big, |
| 3015 | 1× | atoms: vec![AtomRange { |
| 3016 | 1× | change: h1, |
| 3017 | 1× | from: 3, |
| 3018 | 1× | to: 7, |
| 3019 | 1× | }], |
| 3020 | 1× | }], |
| 3021 | | )) |
| 3022 | 1× | .unwrap(); |
| 3023 | |
|
| 3024 | 1× | let graphs = st.checkpoint_file_graphs(); |
| 3025 | 1× | let mut blobs: HashMap<ObjectRef, Vec<u8>> = HashMap::new(); |
| 3026 | 1× | let index = st.checkpoint_index(&graphs, |enc| { |
| 3027 | 1× | let r = crate::hash::hash_object(crate::hash::ObjectType::Blob, enc); |
| 3028 | 1× | blobs.insert(r, enc.to_vec()); |
| 3029 | 1× | r |
| 3030 | 1× | }); |
| 3031 | 1× | assert_eq!(blobs.len(), 1, "only the large graph is a blob of its own"); |
| 3032 | 1× | assert_eq!( |
| 3033 | 1× | State::checkpoint_graph_refs(&index).unwrap(), |
| 3034 | 1× | blobs.keys().copied().collect::<Vec<_>>() |
| 3035 | | ); |
| 3036 | 1× | assert!( |
| 3037 | 1× | State::checkpoint_graph_refs(&st.checkpoint_payload()) |
| 3038 | 1× | .unwrap() |
| 3039 | 1× | .is_empty(), |
| 3040 | | "version 1 names none" |
| 3041 | | ); |
| 3042 | 1× | assert!(index.len() < st.checkpoint_payload().len()); |
| 3043 | |
|
| 3044 | 1× | let back = State::from_checkpoint(&index, |refs| { |
| 3045 | 1× | refs.iter() |
| 3046 | 1× | .map(|r| { |
| 3047 | 1× | blobs |
| 3048 | 1× | .get(r) |
| 3049 | 1× | .cloned() |
| 3050 | 1× | .ok_or_else(|| ObjectError::Schema("missing".into())) |
| 3051 | 1× | }) |
| 3052 | 1× | .collect() |
| 3053 | 1× | }) |
| 3054 | 1× | .unwrap(); |
| 3055 | 1× | assert_eq!( |
| 3056 | 1× | back.checkpoint_payload(), |
| 3057 | 1× | st.checkpoint_payload(), |
| 3058 | | "the same state as version 1" |
| 3059 | | ); |
| 3060 | 1× | assert_eq!( |
| 3061 | 1× | back.materialize().files["big"].content, |
| 3062 | 1× | st.materialize().files["big"].content |
| 3063 | | ); |
| 3064 | | |
| 3065 | 1× | assert_eq!( |
| 3066 | 1× | back.checkpoint_index(&back.checkpoint_file_graphs(), |enc| { |
| 3067 | 1× | crate::hash::hash_object(crate::hash::ObjectType::Blob, enc) |
| 3068 | 1× | }), |
| 3069 | | index |
| 3070 | | ); |
| 3071 | | |
| 3072 | 1× | assert!( |
| 3073 | 1× | State::from_checkpoint(&index, |_| Err(ObjectError::Schema("gone".into()))).is_err() |
| 3074 | | ); |
| 3075 | 1× | assert!( |
| 3076 | 1× | State::from_checkpoint_payload(&index).is_err(), |
| 3077 | | "version 2 needs its blobs" |
| 3078 | | ); |
| 3079 | | |
| 3080 | 1× | assert!(State::from_checkpoint(&st.checkpoint_payload(), |_| unreachable!()).is_ok()); |
| 3081 | 1× | let mut v3 = cbor::decode(&index).unwrap(); |
| 3082 | 1× | if let Value::Map(m) = &mut v3 { |
| 3083 | 1× | m.insert(0, Value::Uint(3)); |
| 3084 | 1× | } |
| 3085 | 1× | assert!(State::from_checkpoint(&cbor::encode(&v3), |_| unreachable!()).is_err()); |
| 3086 | 1× | } |
| 3087 | |
|
| 3088 | | #[test] |
| 3089 | 1× | fn maximal_elements() { |
| 3090 | 1× | let mut st = State::new(); |
| 3091 | 1× | let h1 = st.add(change(vec![], vec![], vec![])).unwrap(); |
| 3092 | 1× | let h2 = st.add(change(vec![h1], vec![], vec![])).unwrap(); |
| 3093 | 1× | let h3 = st.add(change(vec![], vec![], vec![])).unwrap(); |
| 3094 | 1× | let mut m = st.maximal(&[h1, h2, h3]); |
| 3095 | 1× | m.sort(); |
| 3096 | 1× | let mut want = vec![h2, h3]; |
| 3097 | 1× | want.sort(); |
| 3098 | 1× | assert_eq!(m, want); |
| 3099 | 1× | assert_eq!(st.heads(), want); |
| 3100 | 1× | } |
| 3101 | |
|
| 3102 | | |
| 3103 | | |
| 3104 | | #[test] |
| 3105 | 1× | fn depends_on_matches_the_closure() { |
| 3106 | | use rand::{Rng, SeedableRng}; |
| 3107 | 1× | let mut rng = rand::rngs::StdRng::seed_from_u64(11); |
| 3108 | 1× | for _ in 0..10 { |
| 3109 | 10× | let mut st = State::new(); |
| 3110 | 10× | let mut all: Vec<ChangeHash> = Vec::new(); |
| 3111 | 10× | for _ in 0..80 { |
| 3112 | 800× | let deps: Vec<ChangeHash> = |
| 3113 | 31600× | all.iter().copied().filter(|_| rng.gen_bool(0.06)).collect(); |
| 3114 | 800× | all.push(st.add(change(deps, vec![], vec![])).unwrap()); |
| 3115 | | } |
| 3116 | 10× | let unknown = ObjectRef([0xee; 32]); |
| 3117 | 800× | for a in &all { |
| 3118 | 800× | let want = st.closure(a).clone(); |
| 3119 | 800× | st.closure.write().unwrap().sets.clear(); |
| 3120 | 800× | st.closure.write().unwrap().held = 0; |
| 3121 | 64800× | for b in all.iter().chain([&unknown]) { |
| 3122 | 64800× | assert_eq!( |
| 3123 | 64800× | st.depends_on(a, b), |
| 3124 | 64800× | a == b || want.contains(b), |
| 3125 | | "{a:?} on {b:?}" |
| 3126 | | ); |
| 3127 | | } |
| 3128 | | } |
| 3129 | 10× | assert!(st.closure.write().unwrap().held <= CLOSURE_MEMO_HASHES); |
| 3130 | | } |
| 3131 | 1× | } |
| 3132 | |
|
| 3133 | | |
| 3134 | | |
| 3135 | | |
| 3136 | | #[test] |
| 3137 | 1× | fn maximal_matches_its_definition() { |
| 3138 | | use rand::{Rng, SeedableRng}; |
| 3139 | 1× | let mut rng = rand::rngs::StdRng::seed_from_u64(7); |
| 3140 | 1× | for _ in 0..20 { |
| 3141 | 20× | let mut st = State::new(); |
| 3142 | 20× | let mut all: Vec<ChangeHash> = Vec::new(); |
| 3143 | 20× | for _ in 0..60 { |
| 3144 | 1200× | let deps: Vec<ChangeHash> = |
| 3145 | 35400× | all.iter().copied().filter(|_| rng.gen_bool(0.05)).collect(); |
| 3146 | 1200× | all.push(st.add(change(deps, vec![], vec![])).unwrap()); |
| 3147 | | } |
| 3148 | 20× | let mut pick: Vec<ChangeHash> = |
| 3149 | 1200× | all.iter().copied().filter(|_| rng.gen_bool(0.4)).collect(); |
| 3150 | 20× | pick.extend(pick.clone().into_iter().take(3)); |
| 3151 | 20× | pick.push(ObjectRef([0xee; 32])); |
| 3152 | 20× | let set: BTreeSet<ChangeHash> = pick.iter().copied().collect(); |
| 3153 | 20× | let want: Vec<ChangeHash> = set |
| 3154 | 20× | .iter() |
| 3155 | 8420× | .filter(|h| !set.iter().any(|o| o != *h && st.closure(o).contains(h))) |
| 3156 | 20× | .copied() |
| 3157 | 20× | .collect(); |
| 3158 | 20× | assert_eq!(st.maximal(&pick), want); |
| 3159 | 20× | assert_eq!(st.maximal(&all), st.heads()); |
| 3160 | | } |
| 3161 | 1× | } |
| 3162 | | } |