alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #5075 from greatroar/idset

Browse source 
internal/restic: Use IDSet.Clone + use maps package
This commit is contained in:
Michael Eischer 2024-10-09 19:55:26 +00:00 committed by GitHub
commit 96c1c1a0fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/repository/index/master_index.go
View file

@ -347,6 +347,9 @@ func (mi *MasterIndex) Rewrite(ctx context.Context, repo restic.Unpacked, exclud
// copy excludePacks to prevent unintended sideeffects // copy excludePacks to prevent unintended sideeffects
excludePacks = excludePacks.Clone() excludePacks = excludePacks.Clone()
if excludePacks == nil {
excludePacks = restic.NewIDSet()
}
debug.Log("start rebuilding index of %d indexes, excludePacks: %v", len(indexes), excludePacks) debug.Log("start rebuilding index of %d indexes, excludePacks: %v", len(indexes), excludePacks)
wg, wgCtx := errgroup.WithContext(ctx) wg, wgCtx := errgroup.WithContext(ctx)

33
internal/restic/idset.go
View file

@ -1,6 +1,9 @@
package restic package restic
import "sort" import (
"maps"
"sort"
)
// IDSet is a set of IDs. // IDSet is a set of IDs.
type IDSet map[ID]struct{} type IDSet map[ID]struct{}
@ -44,28 +47,10 @@ func (s IDSet) List() IDs {
} }
// Equals returns true iff s equals other. // Equals returns true iff s equals other.
func (s IDSet) Equals(other IDSet) bool { func (s IDSet) Equals(other IDSet) bool { return maps.Equal(s, other) }
if len(s) != len(other) {
return false
}
for id := range s {
if _, ok := other[id]; !ok {
return false
}
}
// length + one-way comparison is sufficient implication of equality
return true
}
// Merge adds the blobs in other to the current set. // Merge adds the blobs in other to the current set.
func (s IDSet) Merge(other IDSet) { func (s IDSet) Merge(other IDSet) { maps.Copy(s, other) }
for id := range other {
s.Insert(id)
}
}
// Intersect returns a new set containing the IDs that are present in both sets. // Intersect returns a new set containing the IDs that are present in both sets.
func (s IDSet) Intersect(other IDSet) (result IDSet) { func (s IDSet) Intersect(other IDSet) (result IDSet) {
@ -106,8 +91,4 @@ func (s IDSet) String() string {
return "{" + str[1:len(str)-1] + "}" return "{" + str[1:len(str)-1] + "}"
} }
func (s IDSet) Clone() IDSet { func (s IDSet) Clone() IDSet { return maps.Clone(s) }
c := NewIDSet()
c.Merge(s)
return c
}

2
internal/restic/lock.go
View file

@ -187,7 +187,7 @@ func (l *Lock) checkForOtherLocks(ctx context.Context) error {
// Store updates in new IDSet to prevent data races // Store updates in new IDSet to prevent data races
var m sync.Mutex var m sync.Mutex
newCheckedIDs := NewIDSet(checkedIDs.List()...) newCheckedIDs := checkedIDs.Clone()
err = ForAllLocks(ctx, l.repo, checkedIDs, func(id ID, lock *Lock, err error) error { err = ForAllLocks(ctx, l.repo, checkedIDs, func(id ID, lock *Lock, err error) error {
if err != nil { if err != nil {
// if we cannot load a lock then it is unclear whether it can be ignored // if we cannot load a lock then it is unclear whether it can be ignored