Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

filesystem: reuse cache for packfile iterator #517

Merged
merged 1 commit into from
Jul 27, 2017
Merged

filesystem: reuse cache for packfile iterator #517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions storage/filesystem/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ func (s *ObjectStorage) buildPackfileIters(t plumbing.ObjectType, seen map[plumb
return nil, err
}

iter, err := newPackfileIter(pack, t, seen, s.index[h])
iter, err := newPackfileIter(pack, t, seen, s.index[h], s.DeltaBaseCache)
if err != nil {
return nil, err
}
Expand All @@ -284,11 +284,11 @@ type packfileIter struct {
}

func NewPackfileIter(f billy.File, t plumbing.ObjectType) (storer.EncodedObjectIter, error) {
return newPackfileIter(f, t, make(map[plumbing.Hash]bool), nil)
return newPackfileIter(f, t, make(map[plumbing.Hash]bool), nil, nil)
}

func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash]bool,
index *packfile.Index) (storer.EncodedObjectIter, error) {
index *packfile.Index, cache cache.Object) (storer.EncodedObjectIter, error) {
s := packfile.NewScanner(f)
_, total, err := s.Header()
if err != nil {
Expand All @@ -301,6 +301,7 @@ func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash
}

d.SetIndex(index)
d.DeltaBaseCache = cache

return &packfileIter{
f: f,
Expand Down