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
|
package ingest
import (
"fmt"
"io"
"lindenii.org/go/furgit/internal/compress/zlib"
"lindenii.org/go/furgit/internal/format/packfile"
"lindenii.org/go/furgit/internal/format/packfile/delta"
"lindenii.org/go/furgit/internal/progress"
"lindenii.org/go/furgit/object/header"
"lindenii.org/go/furgit/object/id"
)
// adjacency maps each resolvable base to its delta children:
// ofs-deltas keyed by base offset, ref-deltas keyed by base object ID.
type adjacency struct {
byOffset map[int][]int
byOID map[id.ObjectID][]int
}
// resolveDeltas resolves every delta record into a final object ID and type,
// completing thin packs from the external base reader when required.
func (ingestion *ingestion) resolveDeltas() error {
meter := progress.New(progress.Options{
Writer: ingestion.opts.Progress,
Title: "resolving deltas",
Total: ingestion.countDeltas(),
Delay: 0,
Sparse: false,
Throughput: false,
})
adjacency := ingestion.buildAdjacency()
err := ingestion.resolveFrom(ingestion.resolvedRoots(), adjacency, meter)
if err != nil {
return err
}
external := ingestion.unresolvedExternalBases()
switch {
case len(external) == 0 && ingestion.countUnresolved() > 0:
return fmt.Errorf("%w: unresolvable delta entries", ErrMalformedPack)
case len(external) > 0:
err = ingestion.fixThin(external, adjacency, meter)
if err != nil {
return err
}
}
meter.Stop("done")
return nil
}
// buildAdjacency indexes every delta record by its base,
// so a resolved base can find the children that delta against it.
func (ingestion *ingestion) buildAdjacency() adjacency {
out := adjacency{
byOffset: make(map[int][]int),
byOID: make(map[id.ObjectID][]int),
}
for index := range ingestion.records {
rec := &ingestion.records[index]
switch rec.packedType {
case packfile.EntryTypeOfsDelta:
out.byOffset[rec.baseOffset] = append(out.byOffset[rec.baseOffset], index)
case packfile.EntryTypeRefDelta:
out.byOID[rec.baseOID] = append(out.byOID[rec.baseOID], index)
case packfile.EntryTypeInvalid,
packfile.EntryTypeCommit,
packfile.EntryTypeTree,
packfile.EntryTypeBlob,
packfile.EntryTypeTag,
packfile.EntryTypeFuture:
}
}
return out
}
// resolveFrom resolves the delta subtree rooted at each resolved record.
func (ingestion *ingestion) resolveFrom(roots []int, adjacency adjacency, meter *progress.Meter) error {
for _, root := range roots {
content, err := ingestion.inflateRecord(root)
if err != nil {
return err
}
err = ingestion.resolveSubtree(root, content, ingestion.records[root].objectType, 0, adjacency, meter)
if err != nil {
return err
}
}
return nil
}
// resolveSubtree resolves every delta child of one resolved record at depth,
// holding the record's content as the base for its children.
func (ingestion *ingestion) resolveSubtree(
index int,
content []byte,
objectType packfile.EntryType,
depth int,
adjacency adjacency,
meter *progress.Meter,
) error {
rec := &ingestion.records[index]
for _, child := range adjacency.byOffset[rec.offset] {
err := ingestion.resolveChild(child, content, objectType, depth+1, adjacency, meter)
if err != nil {
return err
}
}
for _, child := range adjacency.byOID[rec.oid] {
err := ingestion.resolveChild(child, content, objectType, depth+1, adjacency, meter)
if err != nil {
return err
}
}
return nil
}
// resolveChild applies one delta record at depth against its base content,
// finalizes the record, and recurses into its own children.
func (ingestion *ingestion) resolveChild(
index int,
baseContent []byte,
baseType packfile.EntryType,
depth int,
adjacency adjacency,
meter *progress.Meter,
) error {
rec := &ingestion.records[index]
if rec.resolved {
return nil
}
if depth > delta.MaxChainDepth {
return fmt.Errorf("%w: entry at %d: delta chain too deep", ErrMalformedPack, rec.offset)
}
deltaPayload, err := ingestion.inflateRecord(index)
if err != nil {
return err
}
baseSize, resultSize, _, err := delta.ParseHeaderSizes(deltaPayload)
if err != nil {
return fmt.Errorf("%w: entry at %d: %w", ErrMalformedPack, rec.offset, err)
}
if baseSize != uint64(len(baseContent)) {
return fmt.Errorf("%w: entry at %d: delta base size mismatch", ErrMalformedPack, rec.offset)
}
content, err := delta.Apply(baseContent, deltaPayload)
if err != nil {
return fmt.Errorf("%w: entry at %d: %w", ErrMalformedPack, rec.offset, err)
}
if uint64(len(content)) != resultSize {
return fmt.Errorf("%w: entry at %d: delta result size mismatch", ErrMalformedPack, rec.offset)
}
oid, err := ingestion.hashObject(baseType, content)
if err != nil {
return err
}
rec.objectType = baseType
rec.oid = oid
rec.resolved = true
ingestion.byOID[oid] = index
ingestion.deltasResolved++
meter.Set(ingestion.deltasResolved, 0)
return ingestion.resolveSubtree(index, content, baseType, depth, adjacency, meter)
}
// inflateRecord inflates one record's payload from the temporary pack file.
func (ingestion *ingestion) inflateRecord(index int) ([]byte, error) {
rec := &ingestion.records[index]
offset := int64(rec.dataOffset())
compressedLen := int64(rec.packedLen - rec.headerLen)
size := rec.declaredSize
zr, err := zlib.NewReader(io.NewSectionReader(ingestion.packFile, offset, compressedLen))
if err != nil {
return nil, fmt.Errorf("%w: entry at %d: %w", ErrMalformedPack, rec.offset, err)
}
defer func() { _ = zr.Close() }()
out := make([]byte, size)
_, err = io.ReadFull(zr, out)
if err != nil {
return nil, fmt.Errorf("%w: entry at %d: %w", ErrMalformedPack, rec.offset, err)
}
return out, nil
}
// hashObject computes the object ID of one resolved object.
func (ingestion *ingestion) hashObject(objectType packfile.EntryType, content []byte) (id.ObjectID, error) {
var zero id.ObjectID
ty, err := objectType.ObjectType()
if err != nil {
return zero, fmt.Errorf("object/store/packed/internal/ingest: %w", err)
}
hashImpl, err := ingestion.objectFormat.New()
if err != nil {
return zero, fmt.Errorf("object/store/packed/internal/ingest: %w", err)
}
_, _ = hashImpl.Write(header.Append(nil, ty, len(content)))
_, _ = hashImpl.Write(content)
oid, err := ingestion.objectFormat.FromBytes(hashImpl.Sum(nil))
if err != nil {
return zero, fmt.Errorf("object/store/packed/internal/ingest: %w", err)
}
return oid, nil
}
// resolvedRoots returns the indices of every currently resolved record.
func (ingestion *ingestion) resolvedRoots() []int {
var roots []int
for index := range ingestion.records {
if ingestion.records[index].resolved {
roots = append(roots, index)
}
}
return roots
}
// countDeltas returns the number of delta records.
func (ingestion *ingestion) countDeltas() int {
return ingestion.deltaCount
}
// countUnresolved returns the number of records that remain unresolved.
//
// Every base is resolved during scanning or thin completion,
// so the unresolved records are exactly the unresolved deltas:
// the delta records minus those already resolved.
func (ingestion *ingestion) countUnresolved() int {
return ingestion.deltaCount - ingestion.deltasResolved
}
// unresolvedExternalBases returns the unique base object IDs
// of unresolved ref-deltas whose base is not present in the pack,
// in first-reference order.
func (ingestion *ingestion) unresolvedExternalBases() []id.ObjectID {
seen := make(map[id.ObjectID]struct{})
out := make([]id.ObjectID, 0, ingestion.deltaCount-ingestion.deltasResolved)
for index := range ingestion.records {
rec := &ingestion.records[index]
if rec.resolved || rec.packedType != packfile.EntryTypeRefDelta {
continue
}
if _, ok := ingestion.byOID[rec.baseOID]; ok {
continue
}
if _, ok := seen[rec.baseOID]; ok {
continue
}
seen[rec.baseOID] = struct{}{}
out = append(out, rec.baseOID)
}
return out
}
|