octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-12-27 20:45:19 +00:00
Code Issues Releases Wiki Activity

repository: removed redundant prepareCache method from Repository

Browse Source 
* remove the prepareCache method from the Repository
* changed the signature of the SetIndex function to no longer return an error
This commit is contained in:
Srigovind Nayak 2024-08-11 15:58:27 +05:30 committed by Michael Eischer
parent 0cf1737289
commit 1e68fbca90
4 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/checker/checker.go
View File

@ -146,11 +146,7 @@ func (c *Checker) LoadIndex(ctx context.Context, p *progress.Counter) (hints []e
return hints, append(errs, err)
}
err = c.repo.SetIndex(c.masterIndex)
if err != nil {
debug.Log("SetIndex returned error: %v", err)
errs = append(errs, err)
}
c.repo.SetIndex(c.masterIndex)
// compute pack size using index entries
c.packs, err = pack.Size(ctx, c.repo, false)

6
internal/repository/repair_index.go
View File

@ -52,10 +52,8 @@ func RepairIndex(ctx context.Context, repo *Repository, opts RepairIndexOptions,
return err
}
err = repo.SetIndex(mi)
if err != nil {
return err
}
repo.SetIndex(mi)
packSizeFromIndex, err = pack.Size(ctx, repo, false)
if err != nil {
return err

37
internal/repository/repository.go
View File

@ -6,7 +6,6 @@ import (
"fmt"
"io"
"math"
"os"
"runtime"
"sort"
"sync"
@ -586,9 +585,8 @@ func (r *Repository) ListPacksFromIndex(ctx context.Context, packs restic.IDSet)
}
// SetIndex instructs the repository to use the given index.
func (r *Repository) SetIndex(i restic.MasterIndex) error {
func (r *Repository) SetIndex(i restic.MasterIndex) {
r.idx = i.(*index.MasterIndex)
return r.prepareCache()
}
func (r *Repository) clearIndex() {
@ -628,12 +626,8 @@ func (r *Repository) LoadIndex(ctx context.Context, p *progress.Counter) error {
return errors.New("index uses feature not supported by repository version 1")
}
}
if ctx.Err() != nil {
return ctx.Err()
}
// remove index files from the cache which have been removed in the repo
return r.prepareCache()
return ctx.Err()
}
// createIndexFromPacks creates a new index by reading all given pack files (with sizes).
@ -699,33 +693,6 @@ func (r *Repository) createIndexFromPacks(ctx context.Context, packsize map[rest
return invalid, nil
}
// prepareCache initializes the local cache. indexIDs is the list of IDs of
// index files still present in the repo.
func (r *Repository) prepareCache() error {
if r.Cache == nil {
return nil
}
indexIDs := r.idx.IDs()
debug.Log("prepare cache with %d index files", len(indexIDs))
// clear old index files
err := r.Cache.Clear(restic.IndexFile, indexIDs)
if err != nil {
fmt.Fprintf(os.Stderr, "error clearing index files in cache: %v\n", err)
}
packs := r.idx.Packs(restic.NewIDSet())
// clear old packs
err = r.Cache.Clear(restic.PackFile, packs)
if err != nil {
fmt.Fprintf(os.Stderr, "error clearing pack files in cache: %v\n", err)
}
return nil
}
// SearchKey finds a key with the supplied password, afterwards the config is
// read and parsed. It tries at most maxKeys key files in the repo.
func (r *Repository) SearchKey(ctx context.Context, password string, maxKeys int, keyHint string) error {

2
internal/restic/repository.go
View File

@ -22,7 +22,7 @@ type Repository interface {
Key() *crypto.Key
LoadIndex(ctx context.Context, p *progress.Counter) error
SetIndex(mi MasterIndex) error
SetIndex(mi MasterIndex)
LookupBlob(t BlobType, id ID) []PackedBlob
LookupBlobSize(t BlobType, id ID) (size uint, exists bool)