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

checker: Use backend.IDSet instead of custom struct

Browse source
This commit is contained in:
Alexander Neumann 2016-02-26 21:36:27 +01:00
parent 5ce1375ddd
commit a613e23e34
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/restic/checker/checker.go
View file

@ -20,8 +20,8 @@ import (
// A Checker only tests for internal errors within the data structures of the // A Checker only tests for internal errors within the data structures of the
// repository (e.g. missing blobs), and needs a valid Repository to work on. // repository (e.g. missing blobs), and needs a valid Repository to work on.
type Checker struct { type Checker struct {
packs map[backend.ID]struct{} packs backend.IDSet
blobs map[backend.ID]struct{} blobs backend.IDSet
blobRefs struct { blobRefs struct {
sync.Mutex sync.Mutex
M map[backend.ID]uint M map[backend.ID]uint
@ -37,8 +37,8 @@ type Checker struct {
// New returns a new checker which runs on repo. // New returns a new checker which runs on repo.
func New(repo *repository.Repository) *Checker { func New(repo *repository.Repository) *Checker {
c := &Checker{ c := &Checker{
packs: make(map[backend.ID]struct{}), packs: backend.NewIDSet(),
blobs: make(map[backend.ID]struct{}), blobs: backend.NewIDSet(),
masterIndex: repository.NewMasterIndex(), masterIndex: repository.NewMasterIndex(),
indexes: make(map[backend.ID]*repository.Index), indexes: make(map[backend.ID]*repository.Index),
repo: repo, repo: repo,
@ -136,8 +136,8 @@ func (c *Checker) LoadIndex() (hints []error, errs []error) {
debug.Log("LoadIndex", "process blobs") debug.Log("LoadIndex", "process blobs")
cnt := 0 cnt := 0
for blob := range res.Index.Each(done) { for blob := range res.Index.Each(done) {
c.packs[blob.PackID] = struct{}{} c.packs.Insert(blob.PackID)
c.blobs[blob.ID] = struct{}{} c.blobs.Insert(blob.ID)
c.blobRefs.M[blob.ID] = 0 c.blobRefs.M[blob.ID] = 0
cnt++ cnt++
@ -217,7 +217,7 @@ func (c *Checker) Packs(errChan chan<- error, done <-chan struct{}) {
defer close(errChan) defer close(errChan)
debug.Log("Checker.Packs", "checking for %d packs", len(c.packs)) debug.Log("Checker.Packs", "checking for %d packs", len(c.packs))
seenPacks := make(map[backend.ID]struct{}) seenPacks := backend.NewIDSet()
var workerWG sync.WaitGroup var workerWG sync.WaitGroup
@ -228,7 +228,7 @@ func (c *Checker) Packs(errChan chan<- error, done <-chan struct{}) {
} }
for id := range c.packs { for id := range c.packs {
seenPacks[id] = struct{}{} seenPacks.Insert(id)
IDChan <- id IDChan <- id
} }
close(IDChan) close(IDChan)
@ -239,7 +239,7 @@ func (c *Checker) Packs(errChan chan<- error, done <-chan struct{}) {
for id := range c.repo.List(backend.Data, done) { for id := range c.repo.List(backend.Data, done) {
debug.Log("Checker.Packs", "check data blob %v", id.Str()) debug.Log("Checker.Packs", "check data blob %v", id.Str())
if _, ok := seenPacks[id]; !ok { if !seenPacks.Has(id) {
c.orphanedPacks = append(c.orphanedPacks, id) c.orphanedPacks = append(c.orphanedPacks, id)
select { select {
case <-done: case <-done:
@ -607,7 +607,7 @@ func (c *Checker) checkTree(id backend.ID, tree *restic.Tree) (errs []error) {
debug.Log("Checker.checkTree", "blob %v refcount %d", blobID.Str(), c.blobRefs.M[blobID]) debug.Log("Checker.checkTree", "blob %v refcount %d", blobID.Str(), c.blobRefs.M[blobID])
c.blobRefs.Unlock() c.blobRefs.Unlock()
if _, ok := c.blobs[blobID]; !ok { if !c.blobs.Has(blobID) {
debug.Log("Checker.trees", "tree %v references blob %v which isn't contained in index", id.Str(), blobID.Str()) debug.Log("Checker.trees", "tree %v references blob %v which isn't contained in index", id.Str(), blobID.Str())
errs = append(errs, Error{TreeID: &id, BlobID: &blobID, Err: errors.New("not found in index")}) errs = append(errs, Error{TreeID: &id, BlobID: &blobID, Err: errors.New("not found in index")})