mirror/kopia
1
0 Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-09-08 11:26:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(repository): unified data and metadata cache implementations (#1864)

Browse Source 
With this change there's now a single implementation with one boolean parameter that indicates whether we should fetch blobs or contents.
This commit is contained in:
Jarek Kowalski authored and GitHub committed 2022-03-27 08:53:20 -07:00
1 parent b19d892e3d
commit b64ad62f69
8 files changed
+286 -280
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/cache/content_cache_test.go
Vendored
+30 -12
View File
@@ -56,11 +56,14 @@ func TestCacheExpiration(t *testing.T) {
underlyingStorage := newUnderlyingStorageForContentCacheTesting(t)
ctx := testlogging.Context(t)
cc, err := cache.NewContentCacheForData(ctx, underlyingStorage, cacheStorage.(cache.Storage), cache.SweepSettings{
MaxSizeBytes: 10000,
SweepFrequency: 500 * time.Millisecond,
TouchThreshold: -1,
}, nil)
cc, err := cache.NewContentCache(ctx, underlyingStorage, cache.Options{
Storage: cacheStorage.(cache.Storage),
Sweep: cache.SweepSettings{
MaxSizeBytes: 10000,
SweepFrequency: 500 * time.Millisecond,
TouchThreshold: -1,
},
})
require.NoError(t, err)
@@ -118,9 +121,12 @@ func TestDiskContentCache(t *testing.T) {
t.Fatal(err)
}
cc, err := cache.NewContentCacheForData(ctx, newUnderlyingStorageForContentCacheTesting(t), cacheStorage, cache.SweepSettings{
MaxSizeBytes: maxBytes,
}, nil)
cc, err := cache.NewContentCache(ctx, newUnderlyingStorageForContentCacheTesting(t), cache.Options{
Storage: cacheStorage,
Sweep: cache.SweepSettings{
MaxSizeBytes: maxBytes,
},
})
if err != nil {
t.Fatalf("err: %v", err)
}
@@ -209,7 +215,10 @@ func TestCacheFailureToOpen(t *testing.T) {
faultyCache.AddFault(blobtesting.MethodGetMetadata).ErrorInstead(someError)
// Will fail because of ListBlobs failure.
_, err := cache.NewContentCacheForData(testlogging.Context(t), underlyingStorage, withoutTouchBlob{faultyCache}, cache.SweepSettings{MaxSizeBytes: 10000}, nil)
_, err := cache.NewContentCache(testlogging.Context(t), underlyingStorage, cache.Options{
Storage: withoutTouchBlob{faultyCache},
Sweep: cache.SweepSettings{MaxSizeBytes: 10000},
})
if err == nil || !strings.Contains(err.Error(), someError.Error()) {
t.Errorf("invalid error %v, wanted: %v", err, someError)
}
@@ -217,7 +226,10 @@ func TestCacheFailureToOpen(t *testing.T) {
// ListBlobs fails only once, next time it succeeds.
ctx := testlogging.Context(t)
cc, err := cache.NewContentCacheForData(ctx, underlyingStorage, withoutTouchBlob{faultyCache}, cache.SweepSettings{MaxSizeBytes: 10000}, nil)
cc, err := cache.NewContentCache(ctx, underlyingStorage, cache.Options{
Storage: withoutTouchBlob{faultyCache},
Sweep: cache.SweepSettings{MaxSizeBytes: 10000},
})
if err != nil {
t.Fatalf("err: %v", err)
}
@@ -233,7 +245,10 @@ func TestCacheFailureToWrite(t *testing.T) {
underlyingStorage := newUnderlyingStorageForContentCacheTesting(t)
faultyCache := blobtesting.NewFaultyStorage(cacheStorage)
cc, err := cache.NewContentCacheForData(testlogging.Context(t), underlyingStorage, withoutTouchBlob{faultyCache}, cache.SweepSettings{MaxSizeBytes: 10000}, nil)
cc, err := cache.NewContentCache(testlogging.Context(t), underlyingStorage, cache.Options{
Storage: withoutTouchBlob{faultyCache},
Sweep: cache.SweepSettings{MaxSizeBytes: 10000},
})
if err != nil {
t.Fatalf("err: %v", err)
}
@@ -273,7 +288,10 @@ func TestCacheFailureToRead(t *testing.T) {
underlyingStorage := newUnderlyingStorageForContentCacheTesting(t)
faultyCache := blobtesting.NewFaultyStorage(cacheStorage)
cc, err := cache.NewContentCacheForData(testlogging.Context(t), underlyingStorage, withoutTouchBlob{faultyCache}, cache.SweepSettings{MaxSizeBytes: 10000}, nil)
cc, err := cache.NewContentCache(testlogging.Context(t), underlyingStorage, cache.Options{
Storage: withoutTouchBlob{faultyCache},
Sweep: cache.SweepSettings{MaxSizeBytes: 10000},
})
if err != nil {
t.Fatalf("err: %v", err)
}