github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-19 18:02:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3993 from DavidSpek/update-golang-lru

Browse Source 
Update github.com/hashicorp/golang-lru to v2
This commit is contained in:
Milos Gajdos
2023-08-18 08:09:11 +01:00
committed by GitHub
parent ac7a334069 0f006548a1
commit ac32466188
17 changed files with 790 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
registry/storage/cache/memory/memory.go vendored
View File

@@ -7,7 +7,7 @@ import (
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/storage/cache"
lru "github.com/hashicorp/golang-lru"
"github.com/hashicorp/golang-lru/arc/v2"
"github.com/opencontainers/go-digest"
)
@@ -26,7 +26,7 @@ type descriptorCacheKey struct {
}
type inMemoryBlobDescriptorCacheProvider struct {
lru *lru.ARCCache
lru *arc.ARCCache[descriptorCacheKey, distribution.Descriptor]
}
// NewInMemoryBlobDescriptorCacheProvider returns a new mapped-based cache for
@@ -35,7 +35,7 @@ func NewInMemoryBlobDescriptorCacheProvider(size int) cache.BlobDescriptorCacheP
if size <= 0 {
size = math.MaxInt
}
lruCache, err := lru.NewARC(size)
lruCache, err := arc.NewARC[descriptorCacheKey, distribution.Descriptor](size)
if err != nil {
// NewARC can only fail if size is <= 0, so this unreachable
panic(err)
@@ -66,11 +66,7 @@ func (imbdcp *inMemoryBlobDescriptorCacheProvider) Stat(ctx context.Context, dgs
}
descriptor, ok := imbdcp.lru.Get(key)
if ok {
// Type assertion not really necessary, but included in case
// it's necessary for the fuzzer
if desc, ok := descriptor.(distribution.Descriptor); ok {
return desc, nil
}
return descriptor, nil
}
return distribution.Descriptor{}, distribution.ErrBlobUnknown
}
@@ -130,11 +126,7 @@ func (rsimbdcp *repositoryScopedInMemoryBlobDescriptorCache) Stat(ctx context.Co
}
descriptor, ok := rsimbdcp.parent.lru.Get(key)
if ok {
// Type assertion not really necessary, but included in case
// it's necessary for the fuzzer
if desc, ok := descriptor.(distribution.Descriptor); ok {
return desc, nil
}
return descriptor, nil
}
return distribution.Descriptor{}, distribution.ErrBlobUnknown
}