grit-lib 0.5.18

Core library for the grit Git implementation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
//! Verbatim pack reuse for bitmap-accelerated upload-pack (streaming PACK v2).
//!
//! ```rust
//! use grit_lib::pack_objects::PackStats;
//! let _ = std::any::type_name::<PackStats>();
//! ```

use std::collections::{HashMap, HashSet};
use std::io::Write;
use std::path::Path;
use std::sync::Arc;

use crate::bitmap_walk::ReachableSet;
use crate::error::{Error, Result};
use crate::ewah_bitmap::Bitmap;
use crate::midx::{read_midx_btmp_ranges, read_midx_pack_idx_names, read_midx_preferred_idx_name};
use crate::objects::{oid_hash_map_from, ObjectId};
use crate::pack::{
    find_position_by_pack_offset, pack_entry_raw_end, pack_entry_zlib_start,
    parse_pack_object_header, read_local_pack_indexes_cached, read_pack_bytes_cached,
    read_packed_delta_dependency, PackedDeltaDependency, PackedType,
};
use crate::pack_index::PackIndex;
use crate::pack_map::PackData;
use crate::pack_object_select::try_bitmap_reachable_for_upload;
use crate::pack_objects::{
    encode_ofs_delta_distance, encode_pack_object_header, write_delta_pack_stream,
    PackBuildOptions, PackProgress, PackStats,
};
use crate::repo::Repository;
use crate::rev_list::ObjectFilter;

struct BitmappedPack {
    idx: Arc<PackIndex>,
    pack_bytes: Arc<PackData>,
    bitmap_pos: u32,
    bitmap_nr: u32,
}

/// Counters updated while streaming reused pack bytes.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub struct ReuseWriteStats {
    /// Pack body bytes copied verbatim from an existing on-disk pack.
    pub verbatim_reuse_bytes: u64,
    /// Objects emitted via verbatim pack reuse.
    pub verbatim_reuse_objects: u32,
    /// Reused OFS deltas with remapped base offsets.
    pub pack_ofs_fixup_objects: u32,
    /// OFS deltas converted to REF deltas for thin packs.
    pub pack_ref_from_ofs_objects: u32,
}

impl ReuseWriteStats {
    fn note_ofs_fixup(&mut self) {
        self.pack_ofs_fixup_objects += 1;
        self.verbatim_reuse_objects += 1;
    }

    fn note_ref_from_ofs(&mut self) {
        self.pack_ref_from_ofs_objects += 1;
        self.verbatim_reuse_objects += 1;
    }

    fn note_verbatim_slice(&mut self, bytes: u64) {
        self.verbatim_reuse_bytes += bytes;
        self.verbatim_reuse_objects += 1;
    }
}

/// Active verbatim reuse context while streaming a pack body.
pub struct StreamingReuse {
    pack: BitmappedPack,
    reuse_bits: Bitmap,
    index: Arc<crate::pack_bitmap::BitmapIndex>,
    source_to_output: HashMap<u64, u64>,
    stats: ReuseWriteStats,
}

impl StreamingReuse {
    #[must_use]
    pub(crate) fn take_stats(&mut self) -> ReuseWriteStats {
        std::mem::take(&mut self.stats)
    }

    fn note_verbatim(&mut self, bytes: u64) {
        self.stats.verbatim_reuse_bytes += bytes;
        self.stats.verbatim_reuse_objects += 1;
    }

    fn note_ofs_fixup(&mut self) {
        self.stats.pack_ofs_fixup_objects += 1;
        self.stats.verbatim_reuse_objects += 1;
    }

    pub(crate) fn record_ofs_fixup(&mut self) {
        self.note_ofs_fixup();
    }

    pub(crate) fn record_verbatim_zlib(&mut self, zlib_bytes: u64) {
        self.stats.verbatim_reuse_bytes += zlib_bytes;
    }
}

impl StreamingReuse {
    fn new(pack: BitmappedPack, reuse_bits: Bitmap, send_set: &ReachableSet) -> Self {
        Self {
            pack,
            reuse_bits,
            index: Arc::clone(send_set.bitmap_index()),
            source_to_output: HashMap::new(),
            stats: ReuseWriteStats::default(),
        }
    }

    fn marks_reuse(&self, oid: &ObjectId) -> bool {
        let Some(pos) = self.index.position_of(oid) else {
            return false;
        };
        self.reuse_bits.get(pos as usize)
    }

    /// Copy a whole packed object when marked reusable; returns bytes written.
    pub(crate) fn try_write_whole(
        &mut self,
        w: &mut dyn Write,
        oid: &ObjectId,
        out_offset: u64,
        opts: &PackBuildOptions,
    ) -> Result<Option<u64>> {
        if !opts.reuse_objects || !self.marks_reuse(oid) {
            return Ok(None);
        }
        let objects_dir = self
            .pack
            .idx
            .idx_path
            .parent()
            .and_then(|p| p.parent())
            .ok_or_else(|| Error::CorruptObject("pack path layout".to_owned()))?;
        let written = match write_whole_reused(w, objects_dir, oid, opts) {
            Ok(n) => n,
            Err(_) => return Ok(None),
        };
        self.note_verbatim(written);
        if let Some(entry_off) = self.pack.idx.find_offset(oid)? {
            self.source_to_output.insert(entry_off, out_offset);
        }
        Ok(Some(written))
    }

    /// Copy or rewrite a delta object when marked reusable.
    pub(crate) fn try_write_delta(
        &mut self,
        w: &mut dyn Write,
        oid: &ObjectId,
        out_offset: u64,
        in_pack_base: Option<u64>,
        opts: &PackBuildOptions,
        oid_to_offset: &crate::objects::OidHashMap<u64>,
    ) -> Result<Option<u64>> {
        if !self.marks_reuse(oid) {
            return Ok(None);
        }
        let Some(entry_off) = self.pack.idx.find_offset(oid)? else {
            return Ok(None);
        };
        let pack_bytes = self.pack.pack_bytes.as_ref();
        let mut offset_map: HashMap<u64, u64> = self.source_to_output.clone();
        for (base_oid, out_off) in oid_to_offset {
            if let Some(src) = self.pack.idx.find_offset(base_oid)? {
                offset_map.entry(src).or_insert(*out_off);
            }
        }
        let hb = self.pack.idx.hash_bytes();
        let written = match write_one_reused(
            w,
            &mut self.stats,
            &self.pack,
            pack_bytes,
            entry_off,
            hb,
            opts,
            &offset_map,
            out_offset,
            in_pack_base,
        ) {
            Ok(n) => n,
            Err(_) => return Ok(None),
        };
        self.source_to_output.insert(entry_off, out_offset);
        Ok(Some(written))
    }
}

/// Write a PACK stream to `w` using bitmap reachability and verbatim reuse when possible.
///
/// Returns [`None`] when reuse is unavailable (caller should stream via [`crate::pack_objects::PackObjects`]).
#[allow(clippy::too_many_arguments)]
pub fn try_write_streaming_pack(
    repo: &Repository,
    wants: &[ObjectId],
    haves: &[ObjectId],
    source_shallow: &HashSet<ObjectId>,
    have_shallow: &HashSet<ObjectId>,
    filter: Option<&ObjectFilter>,
    opts: &PackBuildOptions,
    progress: &mut dyn FnMut(PackProgress),
    w: &mut dyn Write,
) -> Result<Option<PackStats>> {
    if !source_shallow.is_empty() || !have_shallow.is_empty() {
        return Ok(None);
    }
    let Some((send_set, have_closure)) =
        try_bitmap_reachable_for_upload(repo.odb(), wants, haves, filter, source_shallow)?
    else {
        return Ok(None);
    };
    let index = send_set.bitmap_index();
    let objects_dir = repo.odb().objects_dir();
    let packs = resolve_bitmapped_packs(objects_dir, index, allow_multi_pack_reuse(repo))?;
    if packs.is_empty() {
        return Ok(None);
    }
    let Some(pack) = packs.into_iter().next() else {
        return Ok(None);
    };
    let send: Vec<ObjectId> = send_set.iter_grouped_by_kind().collect();
    progress(PackProgress::Enumerated { total: send.len() });

    let send_bits = send_set.reuse_send_bits();
    let reuse_bits = compute_reuse_bits(&pack, send_bits, &send_set, opts)?;

    let blob_name_hashes =
        crate::pack_object_select::blob_name_hashes_for_send(index, &send, &have_closure);
    let plan = crate::pack_objects::plan_deltas(
        repo.odb(),
        &send,
        &have_closure,
        opts,
        &oid_hash_map_from(&blob_name_hashes),
        None,
    )?;
    progress(PackProgress::PlannedDeltas);

    let mut reuse = StreamingReuse::new(pack, reuse_bits, &send_set);
    let stats = write_delta_pack_stream(repo.odb(), &plan, opts, w, Some(&mut reuse))?;
    Ok(Some(stats))
}

fn allow_multi_pack_reuse(_repo: &Repository) -> bool {
    false
}

fn resolve_bitmapped_packs(
    objects_dir: &Path,
    index: &crate::pack_bitmap::BitmapIndex,
    multi: bool,
) -> Result<Vec<BitmappedPack>> {
    let pack_dir = objects_dir.join("pack");
    let btmp = read_midx_btmp_ranges(objects_dir)?;
    let idx_names = read_midx_pack_idx_names(objects_dir).unwrap_or_default();
    let indexes: HashMap<String, Arc<PackIndex>> = read_local_pack_indexes_cached(objects_dir)?
        .into_iter()
        .map(|idx| {
            let stem = idx
                .idx_path
                .file_stem()
                .and_then(|s| s.to_str())
                .unwrap_or("")
                .to_owned();
            (stem, idx)
        })
        .collect();

    if !btmp.is_empty() {
        let mut ranges: Vec<_> = btmp.into_iter().filter(|r| r.bitmap_nr > 0).collect();
        if !multi {
            if let Ok(pref) = read_midx_preferred_idx_name(objects_dir) {
                let stem = pref.strip_suffix(".idx").unwrap_or(&pref);
                if let Some(pos) = idx_names.iter().position(|n| n == &pref) {
                    ranges.retain(|r| r.pack_id == pos as u32);
                } else if indexes.contains_key(stem) {
                    ranges.retain(|r| {
                        idx_names
                            .get(r.pack_id as usize)
                            .is_some_and(|n| n.strip_suffix(".idx").unwrap_or(n) == stem)
                    });
                } else {
                    ranges.truncate(1);
                }
            } else {
                ranges.truncate(1);
            }
        }
        let mut out = Vec::new();
        for range in ranges {
            let Some(name) = idx_names.get(range.pack_id as usize) else {
                continue;
            };
            let stem = name.strip_suffix(".idx").unwrap_or(name);
            let Some(idx) = indexes.get(stem) else {
                continue;
            };
            let pack_bytes = read_pack_bytes_cached(&idx.pack_path)?;
            out.push(BitmappedPack {
                idx: Arc::clone(idx),
                pack_bytes,
                bitmap_pos: range.bitmap_pos,
                bitmap_nr: range.bitmap_nr,
            });
        }
        if !out.is_empty() {
            return Ok(out);
        }
    }

    let count = index.object_count();
    if count == 0 {
        return Ok(Vec::new());
    }
    if let Some(idx) = index.backing_pack_index() {
        let pack_bytes = read_pack_bytes_cached(&idx.pack_path)?;
        return Ok(vec![BitmappedPack {
            idx,
            pack_bytes,
            bitmap_pos: 0,
            bitmap_nr: count,
        }]);
    }
    let mut with_bitmap: Vec<Arc<PackIndex>> = indexes
        .values()
        .filter(|idx| {
            idx.idx_path
                .file_stem()
                .and_then(|s| s.to_str())
                .is_some_and(|stem| pack_dir.join(format!("{stem}.bitmap")).is_file())
        })
        .cloned()
        .collect();
    with_bitmap.sort_by_key(|idx| std::cmp::Reverse(idx.len()));
    if let Some(idx) = with_bitmap.into_iter().next() {
        let pack_bytes = read_pack_bytes_cached(&idx.pack_path)?;
        return Ok(vec![BitmappedPack {
            idx,
            pack_bytes,
            bitmap_pos: 0,
            bitmap_nr: count,
        }]);
    }
    Ok(Vec::new())
}

fn compute_reuse_bits(
    pack: &BitmappedPack,
    send_bits: &Bitmap,
    send_set: &ReachableSet,
    opts: &PackBuildOptions,
) -> Result<Bitmap> {
    let mut reuse = Bitmap::new();
    let pack_bytes = pack.pack_bytes.as_ref();
    let hb = pack.idx.hash_bytes();
    loop {
        let mut changed = false;
        for rel in 0..pack.bitmap_nr {
            let pos = pack.bitmap_pos + rel;
            if !send_bits.get(pos as usize) || reuse.get(pos as usize) {
                continue;
            }
            let Ok(oid) = send_set.bitmap_index().oid_at(pos) else {
                continue;
            };
            let Some(entry_off) = pack.idx.find_offset(&oid)? else {
                continue;
            };
            if !entry_crc_ok(&pack.idx, pack_bytes, entry_off)? {
                continue;
            }
            let mut p = entry_off as usize;
            let (ty, _) = parse_pack_object_header(pack_bytes, &mut p)?;
            match ty {
                PackedType::Commit | PackedType::Tree | PackedType::Blob | PackedType::Tag => {
                    reuse.set(pos as usize);
                    changed = true;
                }
                PackedType::OfsDelta | PackedType::RefDelta => {
                    // Streaming delta reuse is only enabled for thin packs; incremental
                    // OFS fixups use on-disk zlib reuse during planning instead.
                    if !opts.thin {
                        continue;
                    }
                    let Some(base_oid) = delta_base_oid(&pack.idx, pack_bytes, entry_off, hb)?
                    else {
                        continue;
                    };
                    let Some(base_pos) = send_set.bitmap_index().position_of(&base_oid) else {
                        continue;
                    };
                    if !reuse.get(base_pos as usize) {
                        continue;
                    }
                    let Some(base_off) = pack.idx.find_offset(&base_oid)? else {
                        continue;
                    };
                    let mut bp = base_off as usize;
                    let Ok((base_ty, _)) = parse_pack_object_header(pack_bytes, &mut bp) else {
                        continue;
                    };
                    if matches!(base_ty, PackedType::OfsDelta | PackedType::RefDelta) {
                        continue;
                    }
                    reuse.set(pos as usize);
                    changed = true;
                }
            }
        }
        if !changed {
            break;
        }
    }
    Ok(reuse)
}

fn entry_crc_ok(idx: &PackIndex, pack_bytes: &[u8], entry_off: u64) -> Result<bool> {
    let Some(end) = pack_entry_raw_end(idx, pack_bytes, entry_off)? else {
        return Ok(false);
    };
    let slice = &pack_bytes[entry_off as usize..end];
    match idx.crc32_for_pack_offset(entry_off)? {
        Some(crc) => Ok(crc32fast::hash(slice) == crc),
        None => Ok(true),
    }
}

fn delta_base_oid(
    idx: &PackIndex,
    pack_bytes: &[u8],
    entry_off: u64,
    _hb: usize,
) -> Result<Option<ObjectId>> {
    let hb = idx.oid_at(0).len();
    let Some(dep) = read_packed_delta_dependency(pack_bytes, entry_off, hb)? else {
        return Ok(None);
    };
    Ok(Some(match dep {
        PackedDeltaDependency::RefBase { base_oid } => base_oid,
        PackedDeltaDependency::OfsBase { base_offset } => {
            let Some(row) = find_position_by_pack_offset(idx, base_offset)? else {
                return Ok(None);
            };
            ObjectId::from_bytes(idx.oid_at(row))?
        }
    }))
}

fn write_whole_reused(
    w: &mut dyn Write,
    objects_dir: &Path,
    oid: &ObjectId,
    opts: &PackBuildOptions,
) -> Result<u64> {
    if opts.reuse_objects {
        if let Some(raw) = crate::pack::packed_full_object_slice(objects_dir, oid)? {
            w.write_all(&raw).map_err(Error::Io)?;
            return Ok(raw.len() as u64);
        }
    }
    Err(Error::CorruptObject(
        "expected reusable whole object in pack".to_owned(),
    ))
}

#[allow(clippy::too_many_arguments)]
fn write_one_reused(
    w: &mut dyn Write,
    stats: &mut ReuseWriteStats,
    pack: &BitmappedPack,
    pack_bytes: &[u8],
    entry_off: u64,
    _hb: usize,
    opts: &PackBuildOptions,
    offset_map: &HashMap<u64, u64>,
    pack_offset: u64,
    in_pack_base: Option<u64>,
) -> Result<u64> {
    let Some(end) = pack_entry_raw_end(&pack.idx, pack_bytes, entry_off)? else {
        return Err(Error::CorruptObject(
            "truncated reused pack entry".to_owned(),
        ));
    };
    let slice = &pack_bytes[entry_off as usize..end];
    if let Some(crc) = pack.idx.crc32_for_pack_offset(entry_off)? {
        if crc32fast::hash(slice) != crc {
            return Err(Error::CorruptObject("pack reuse CRC mismatch".to_owned()));
        }
    }
    let hash_bytes = pack.idx.oid_at(0).len();
    let mut p = entry_off as usize;
    let (ty, size) = parse_pack_object_header(pack_bytes, &mut p)?;
    let zlib_start = pack_entry_zlib_start(pack_bytes, entry_off, hash_bytes)?;
    match ty {
        PackedType::OfsDelta if opts.use_ofs_delta => {
            let Some(dep) = read_packed_delta_dependency(pack_bytes, entry_off, hash_bytes)? else {
                return Err(Error::CorruptObject(
                    "ofs-delta missing dependency for reuse".to_owned(),
                ));
            };
            let PackedDeltaDependency::OfsBase { base_offset } = dep else {
                return Err(Error::CorruptObject(
                    "expected ofs-delta dependency".to_owned(),
                ));
            };
            if let Some(new_base) = offset_map.get(&base_offset).copied().or(in_pack_base) {
                let dist = pack_offset
                    .checked_sub(new_base)
                    .ok_or_else(|| Error::CorruptObject("ofs-delta fixup underflow".to_owned()))?;
                let mut out = Vec::new();
                encode_pack_object_header(&mut out, 6, size as usize);
                encode_ofs_delta_distance(&mut out, dist);
                out.extend_from_slice(&pack_bytes[zlib_start..end]);
                w.write_all(&out).map_err(Error::Io)?;
                stats.note_ofs_fixup();
                stats.verbatim_reuse_bytes += (end - zlib_start) as u64;
                Ok(out.len() as u64)
            } else if opts.thin {
                let n = write_ref_delta_from_ofs(w, pack_bytes, entry_off, end, size, pack)?;
                stats.note_ref_from_ofs();
                stats.verbatim_reuse_bytes += (end - zlib_start) as u64;
                Ok(n)
            } else {
                Err(Error::CorruptObject(
                    "ofs-delta reuse missing remapped base".to_owned(),
                ))
            }
        }
        PackedType::OfsDelta if !opts.use_ofs_delta && opts.thin => {
            let n = write_ref_delta_from_ofs(w, pack_bytes, entry_off, end, size, pack)?;
            stats.note_ref_from_ofs();
            stats.verbatim_reuse_bytes += (end - zlib_start) as u64;
            Ok(n)
        }
        PackedType::RefDelta => {
            w.write_all(slice).map_err(Error::Io)?;
            stats.note_verbatim_slice(slice.len() as u64);
            Ok(slice.len() as u64)
        }
        _ => {
            w.write_all(slice).map_err(Error::Io)?;
            stats.note_verbatim_slice(slice.len() as u64);
            Ok(slice.len() as u64)
        }
    }
}

fn write_ref_delta_from_ofs(
    w: &mut dyn Write,
    pack_bytes: &[u8],
    entry_off: u64,
    end: usize,
    size: u64,
    pack: &BitmappedPack,
) -> Result<u64> {
    let hash_bytes = pack.idx.oid_at(0).len();
    let zlib_start = pack_entry_zlib_start(pack_bytes, entry_off, hash_bytes)?;
    let Some(dep) = read_packed_delta_dependency(pack_bytes, entry_off, hash_bytes)? else {
        return Err(Error::CorruptObject("missing delta base".to_owned()));
    };
    let base_oid = match dep {
        PackedDeltaDependency::RefBase { base_oid } => base_oid,
        PackedDeltaDependency::OfsBase { base_offset } => {
            let row = find_position_by_pack_offset(&pack.idx, base_offset)?.ok_or_else(|| {
                Error::CorruptObject("ofs delta base missing from index".to_owned())
            })?;
            ObjectId::from_bytes(pack.idx.oid_at(row))?
        }
    };
    let mut out = Vec::new();
    encode_pack_object_header(&mut out, 7, size as usize);
    out.extend_from_slice(base_oid.as_bytes());
    out.extend_from_slice(&pack_bytes[zlib_start..end]);
    w.write_all(&out).map_err(Error::Io)?;
    Ok(out.len() as u64)
}