Skip to content

Commit 4aab172

Browse files
committed
db: remove duplicate TestFileCacheClockPro
The genericcache code already has this test.
1 parent 73bba8f commit 4aab172

File tree

2 files changed

+1
-73
lines changed

2 files changed

+1
-73
lines changed

file_cache_test.go

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
package pebble
66

77
import (
8-
"bufio"
98
"bytes"
109
"context"
1110
"fmt"
1211
"math/rand/v2"
13-
"os"
1412
"path"
15-
"strconv"
1613
"strings"
1714
"sync"
1815
"testing"
@@ -1187,75 +1184,6 @@ func TestFileCacheEvictClose(t *testing.T) {
11871184
}
11881185
}
11891186

1190-
func TestFileCacheClockPro(t *testing.T) {
1191-
// Test data was generated from the python code. See also
1192-
// internal/cache/clockpro_test.go:TestCache.
1193-
f, err := os.Open("internal/cache/testdata/cache")
1194-
require.NoError(t, err)
1195-
1196-
mem := vfs.NewMem()
1197-
objProvider, err := objstorageprovider.Open(objstorageprovider.DefaultSettings(mem, ""))
1198-
require.NoError(t, err)
1199-
defer objProvider.Close()
1200-
1201-
makeTable := func(dfn base.DiskFileNum) {
1202-
require.NoError(t, err)
1203-
f, _, err := objProvider.Create(context.Background(), base.FileTypeTable, dfn, objstorage.CreateOptions{})
1204-
require.NoError(t, err)
1205-
w := sstable.NewWriter(f, sstable.WriterOptions{})
1206-
require.NoError(t, w.Set([]byte("a"), nil))
1207-
require.NoError(t, w.Close())
1208-
}
1209-
1210-
// NB: The file cache size of 200 with a single shard is required for the
1211-
// expected test values.
1212-
fcs := newFileCacheTest(t, 8<<20 /* 8 MB */, 200, 1)
1213-
defer fcs.cleanup()
1214-
1215-
opts := &Options{
1216-
Cache: fcs.blockCache,
1217-
FileCache: fcs.fileCache,
1218-
LoggerAndTracer: &base.LoggerWithNoopTracer{Logger: base.DefaultLogger},
1219-
}
1220-
opts.EnsureDefaults()
1221-
h := fcs.fileCache.newHandle(fcs.blockCacheHandle, objProvider, opts.LoggerAndTracer, opts.MakeReaderOptions(), noopCorruptionFn)
1222-
defer h.Close()
1223-
1224-
scanner := bufio.NewScanner(f)
1225-
tables := make(map[int]bool)
1226-
line := 1
1227-
1228-
for scanner.Scan() {
1229-
fields := bytes.Fields(scanner.Bytes())
1230-
1231-
key, err := strconv.Atoi(string(fields[0]))
1232-
require.NoError(t, err)
1233-
1234-
// Ensure that underlying sstables exist on disk, creating each table the
1235-
// first time it is seen.
1236-
if !tables[key] {
1237-
makeTable(base.DiskFileNum(key))
1238-
tables[key] = true
1239-
}
1240-
1241-
oldHits := fcs.fileCache.c.Metrics().Hits
1242-
m := &manifest.TableMetadata{TableNum: base.TableNum(key)}
1243-
m.InitPhysicalBacking()
1244-
m.TableBacking.Ref()
1245-
v, err := h.findOrCreateTable(context.Background(), m, initFileOpts{})
1246-
require.NoError(t, err)
1247-
v.Unref()
1248-
1249-
hit := fcs.fileCache.c.Metrics().Hits != oldHits
1250-
wantHit := fields[1][0] == 'h'
1251-
if hit != wantHit {
1252-
t.Errorf("%d: cache hit mismatch: got %v, want %v\n", line, hit, wantHit)
1253-
}
1254-
line++
1255-
m.TableBacking.Unref()
1256-
}
1257-
}
1258-
12591187
func BenchmarkNewItersAlloc(b *testing.B) {
12601188
opts := &Options{
12611189
FS: vfs.NewMem(),

internal/genericcache/cache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestBasic(t *testing.T) {
7171
c.Close()
7272
}
7373

74-
func TestFileCacheClockPro(t *testing.T) {
74+
func TestClockPro(t *testing.T) {
7575
// Reuse the data from the block cache. See
7676
// internal/cache/clockpro_test.go:TestCache.
7777
f, err := os.Open("../cache/testdata/cache")

0 commit comments

Comments
 (0)