amorfo77/restic
1
0 Fork 0
mirror of https://github.com/restic/restic.git synced 2026-11-10 08:41:00 +00:00
Code Issues Projects Releases Wiki Activity

repository: move Blob, Blobs and PackedBlob to pack package

Browse Source 
This removes them from the public interface. The latter now only
provides the PackBlob interface, without being bound to the type used
internally by the pack package.
This commit is contained in:
Michael Eischer committed 2026-06-13 18:58:37 +02:00
1 parent 35af104749
commit c062a78dcd
27 files changed
+373 -345
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/repository/checker.go
+8 -7
View File
@@ -129,10 +129,11 @@ func (c *Checker) LoadIndex(ctx context.Context, p restic.TerminalCounterFactory
}
cnt++
if _, ok := packToIndex[blob.PackID]; !ok {
packToIndex[blob.PackID] = restic.NewIDSet()
packID := blob.PackID()
if _, ok := packToIndex[packID]; !ok {
packToIndex[packID] = restic.NewIDSet()
}
packToIndex[blob.PackID].Insert(id)
packToIndex[packID].Insert(id)
}
for pbs := range idx.EachByPack(ctx, restic.NewIDSet()) {
@@ -259,7 +260,7 @@ func (c *Checker) ReadPacks(ctx context.Context, filter func(packs map[restic.ID
type checkTask struct {
id restic.ID
size int64
blobs restic.Blobs
blobs pack.Blobs
}
ch := make(chan checkTask)
@@ -329,7 +330,7 @@ func (c *Checker) ReadPacks(ctx context.Context, filter func(packs map[restic.ID
}
// checkPack reads a pack and checks the integrity of all blobs.
func checkPack(ctx context.Context, r *Repository, id restic.ID, blobs restic.Blobs, size int64, bufRd *bufio.Reader, dec *zstd.Decoder) error {
func checkPack(ctx context.Context, r *Repository, id restic.ID, blobs pack.Blobs, size int64, bufRd *bufio.Reader, dec *zstd.Decoder) error {
err := checkPackInner(ctx, r, id, blobs, size, bufRd, dec)
if err != nil {
if r.cache != nil {
@@ -348,7 +349,7 @@ func checkPack(ctx context.Context, r *Repository, id restic.ID, blobs restic.Bl
return err
}
func checkPackInner(ctx context.Context, r *Repository, id restic.ID, blobs restic.Blobs, size int64, bufRd *bufio.Reader, dec *zstd.Decoder) error {
func checkPackInner(ctx context.Context, r *Repository, id restic.ID, blobs pack.Blobs, size int64, bufRd *bufio.Reader, dec *zstd.Decoder) error {
type partialReadError struct {
error
@@ -465,7 +466,7 @@ func checkPackInner(ctx context.Context, r *Repository, id restic.ID, blobs rest
// Check if blob is contained in index and position is correct
idxHas := false
for _, pb := range r.idx.Lookup(blob.BlobHandle) {
if pb.PackID.Equal(id) && pb.Blob == blob {
if pb.PackID().Equal(id) && pb.Blob == blob {
idxHas = true
break
}