Stowage/restic
2
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-08 06:09:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

diff: use AssociatedBlobSet

Browse source
This commit is contained in:
Michael Eischer 2025-11-19 21:40:48 +01:00
parent ff099a216a
commit d91fe1d7e1
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cmd/restic/cmd_diff.go
View file

@ -124,7 +124,7 @@ func (s *DiffStat) Add(node *data.Node) {
} }
// addBlobs adds the blobs of node to s. // addBlobs adds the blobs of node to s.
func addBlobs(bs restic.BlobSet, node *data.Node) { func addBlobs(bs restic.AssociatedBlobSet, node *data.Node) {
if node == nil { if node == nil {
return return
} }
@ -148,18 +148,18 @@ func addBlobs(bs restic.BlobSet, node *data.Node) {
} }
type DiffStatsContainer struct { type DiffStatsContainer struct {
MessageType string `json:"message_type"` // "statistics" MessageType string `json:"message_type"` // "statistics"
SourceSnapshot string `json:"source_snapshot"` SourceSnapshot string `json:"source_snapshot"`
TargetSnapshot string `json:"target_snapshot"` TargetSnapshot string `json:"target_snapshot"`
ChangedFiles int `json:"changed_files"` ChangedFiles int `json:"changed_files"`
Added DiffStat `json:"added"` Added DiffStat `json:"added"`
Removed DiffStat `json:"removed"` Removed DiffStat `json:"removed"`
BlobsBefore, BlobsAfter, BlobsCommon restic.BlobSet `json:"-"` BlobsBefore, BlobsAfter, BlobsCommon restic.AssociatedBlobSet `json:"-"`
} }
// updateBlobs updates the blob counters in the stats struct. // updateBlobs updates the blob counters in the stats struct.
func updateBlobs(repo restic.Loader, blobs restic.BlobSet, stats *DiffStat, printError func(string, ...interface{})) { func updateBlobs(repo restic.Loader, blobs restic.AssociatedBlobSet, stats *DiffStat, printError func(string, ...interface{})) {
for h := range blobs { for h := range blobs.Keys() {
switch h.Type { switch h.Type {
case restic.DataBlob: case restic.DataBlob:
stats.DataBlobs++ stats.DataBlobs++
@ -177,7 +177,7 @@ func updateBlobs(repo restic.Loader, blobs restic.BlobSet, stats *DiffStat, prin
} }
} }
func (c *Comparer) printDir(ctx context.Context, mode string, stats *DiffStat, blobs restic.BlobSet, prefix string, id restic.ID) error { func (c *Comparer) printDir(ctx context.Context, mode string, stats *DiffStat, blobs restic.AssociatedBlobSet, prefix string, id restic.ID) error {
debug.Log("print %v tree %v", mode, id) debug.Log("print %v tree %v", mode, id)
tree, err := data.LoadTree(ctx, c.repo, id) tree, err := data.LoadTree(ctx, c.repo, id)
if err != nil { if err != nil {
@ -208,7 +208,7 @@ func (c *Comparer) printDir(ctx context.Context, mode string, stats *DiffStat, b
return ctx.Err() return ctx.Err()
} }
func (c *Comparer) collectDir(ctx context.Context, blobs restic.BlobSet, id restic.ID) error { func (c *Comparer) collectDir(ctx context.Context, blobs restic.AssociatedBlobSet, id restic.ID) error {
debug.Log("print tree %v", id) debug.Log("print tree %v", id)
tree, err := data.LoadTree(ctx, c.repo, id) tree, err := data.LoadTree(ctx, c.repo, id)
if err != nil { if err != nil {
@ -442,9 +442,9 @@ func runDiff(ctx context.Context, opts DiffOptions, gopts global.Options, args [
MessageType: "statistics", MessageType: "statistics",
SourceSnapshot: args[0], SourceSnapshot: args[0],
TargetSnapshot: args[1], TargetSnapshot: args[1],
BlobsBefore: restic.NewBlobSet(), BlobsBefore: repo.NewAssociatedBlobSet(),
BlobsAfter: restic.NewBlobSet(), BlobsAfter: repo.NewAssociatedBlobSet(),
BlobsCommon: restic.NewBlobSet(), BlobsCommon: repo.NewAssociatedBlobSet(),
} }
stats.BlobsBefore.Insert(restic.BlobHandle{Type: restic.TreeBlob, ID: *sn1.Tree}) stats.BlobsBefore.Insert(restic.BlobHandle{Type: restic.TreeBlob, ID: *sn1.Tree})
stats.BlobsAfter.Insert(restic.BlobHandle{Type: restic.TreeBlob, ID: *sn2.Tree}) stats.BlobsAfter.Insert(restic.BlobHandle{Type: restic.TreeBlob, ID: *sn2.Tree})