diff options
author | Javi Fontan <jfontan@gmail.com> | 2017-12-20 15:11:38 +0100 |
---|---|---|
committer | Javi Fontan <jfontan@gmail.com> | 2017-12-20 15:27:45 +0100 |
commit | 962eeb399ce322daa4dd6522cdc91d277fbdba2c (patch) | |
tree | 3cfccb1568290dcb0db44cfa94f40b9b012d870f /storage/filesystem/object.go | |
parent | 55b5d736682bf0e251c5bf83d1cf25c298d3ea0c (diff) | |
download | go-git-962eeb399ce322daa4dd6522cdc91d277fbdba2c.tar.gz |
Enforce the use of cache in packfile decoder
Decoder object can make use of an object cache to speed up processing.
Previously the only way to specify it was changing manually the struct
generated by NewDecodeForFile. This lead to some instances to be created
without it and penalized performance.
Now the cache should be explicitly passed to the constructor function.
NewDecoder now creates objects with a cache using the default size.
A new helper function was added to create cache objects with the default
size as this becomes a common task now:
cache.NewObjectLRUDefault()
Signed-off-by: Javi Fontan <jfontan@gmail.com>
Diffstat (limited to 'storage/filesystem/object.go')
-rw-r--r-- | storage/filesystem/object.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index fd52ed5..9c5ca21 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -18,8 +18,6 @@ import ( "gopkg.in/src-d/go-billy.v4" ) -const DefaultMaxDeltaBaseCacheSize = 92 * cache.MiByte - type ObjectStorage struct { // DeltaBaseCache is an object cache uses to cache delta's bases when DeltaBaseCache cache.Object @@ -30,7 +28,7 @@ type ObjectStorage struct { func newObjectStorage(dir *dotgit.DotGit) (ObjectStorage, error) { s := ObjectStorage{ - DeltaBaseCache: cache.NewObjectLRU(DefaultMaxDeltaBaseCacheSize), + DeltaBaseCache: cache.NewObjectLRUDefault(), dir: dir, } @@ -433,13 +431,12 @@ func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash return nil, err } - d, err := packfile.NewDecoderForType(s, memory.NewStorage(), t) + d, err := packfile.NewDecoderForType(s, memory.NewStorage(), t, cache) if err != nil { return nil, err } d.SetIndex(index) - d.DeltaBaseCache = cache return &packfileIter{ f: f, |