mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-14 04:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

disk cache: add a path based API

Browse Source 
This allows maintaining only a single cache entry per path when the
path's contents change.
This commit is contained in:
Kovid Goyal
2025-10-08 06:41:12 +05:30
parent 3d5200e1ce
commit a6335777d9
4 changed files with 198 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
tools/disk_cache/implementation_test.go
View File

@@ -3,7 +3,8 @@ package disk_cache
import (
"fmt"
"os"
"slices"
"path/filepath"
"runtime/debug"
"strings"
"testing"
@@ -23,16 +24,28 @@ func TestDiskCache(t *testing.T) {
if err != nil {
t.Fatal(err)
}
arc := func(dc *DiskCache, expected int) {
if expected != dc.read_count {
t.Fatalf("disk cache has unexpected read count: %d != %d\n%s", expected, dc.read_count, debug.Stack())
}
}
m := dc.Get("missing", "one", "two")
if diff := cmp.Diff(m, make(map[string]string)); diff != "" {
t.Fatalf("Unexpected return from missing: %s", diff)
m, err := dc.Get("missing", "one", "two")
if err != nil {
t.Fatal(err)
}
if len(m) > 0 {
t.Fatalf("Unexpected return from missing: %s", m)
}
dc.Add("k1", map[string][]byte{"1": []byte("abcd"), "2": []byte("efgh")})
arc(dc, 0)
ad := func(key string, expected map[string]string) {
for _, x := range []*DiskCache{dc, dc2} {
actual := x.Get(key, utils.Keys(expected)...)
actual, err := x.Get(key, utils.Keys(expected)...)
if err != nil {
t.Fatal(err)
}
for k, path := range actual {
d, err := os.ReadFile(path)
@@ -47,32 +60,74 @@ func TestDiskCache(t *testing.T) {
}
}
ak := func(keys ...string) {
for _, x := range []*DiskCache{dc, dc2} {
for i, x := range []*DiskCache{dc, dc2} {
kk, err := x.keys()
if err != nil {
t.Fatal(err)
}
slices.Sort(kk)
slices.Sort(keys)
if diff := cmp.Diff(keys, kk); diff != "" {
t.Fatalf("Unexpected keys: %s", diff)
t.Fatalf("wrong keys in %d: %s", i+1, diff)
}
}
}
ad("k1", map[string]string{"1": "abcd", "2": "efgh"})
arc(dc, 0)
arc(dc2, 1)
dc.Add("k1", map[string][]byte{"3": []byte("ijk"), "4": []byte("lmo")})
arc(dc, 1) // because dc2.Get() will have updated the file
arc(dc2, 1)
ak("k1")
dc2.Add("k2", map[string][]byte{"1": []byte("123456789")})
arc(dc, 1)
arc(dc2, 2)
ak("k1", "k2")
ad("k1", map[string]string{"1": "abcd", "2": "efgh", "3": "ijk"})
if dc.entries.TotalSize != 14+9 {
t.Fatalf("TotalSize: %d != %d", dc.entries.TotalSize, 14+9)
}
arc(dc, 2) // dc2.Add()
arc(dc2, 3) // dc.Get()
ak("k2", "k1")
dc.Get("k2")
arc(dc, 3) // dc2.Get()
arc(dc2, 3)
ak("k1", "k2")
dc.Add("k3", map[string][]byte{"1": []byte(strings.Repeat("a", int(dc.MaxSize)-10))})
ak("k3", "k2")
arc(dc, 3)
ak("k2", "k3")
// check that creating a new disk cache prunes
_, err = NewDiskCache(tdir, dc.MaxSize-8)
if err != nil {
t.Fatal(err)
}
ak("k3")
arc(dc, 4) // NewDiskCache()
// test the path api
path := filepath.Join(tdir, "source")
if err = os.WriteFile(path, []byte("abcdfjrof"), 0o600); err != nil {
t.Fatal(err)
}
key, _, err := dc.GetPath(path)
if _, err = dc.AddPath(path, key, map[string][]byte{"1": []byte("1")}); err != nil {
t.Fatal(err)
}
_, _, entries_before, _ := dc.entries_from_folders()
if diff := cmp.Diff(1, len(dc.entries.PathMap)); diff != "" {
t.Fatalf("unexpected pathmap count: %s", diff)
}
if err = os.WriteFile(path, []byte("changed contents"), 0o600); err != nil {
t.Fatal(err)
}
if _, err = dc.AddPath(path, key, map[string][]byte{"1": []byte("2")}); err != nil {
t.Fatal(err)
}
if diff := cmp.Diff(1, len(dc.entries.PathMap)); diff != "" {
t.Fatalf("unexpected pathmap count: %s", diff)
}
_, _, entries_after, _ := dc.entries_from_folders()
if len(entries_before) != len(entries_after) {
t.Fatalf("unexpected entries: %s", entries_after)
}
arc(dc, 4)
}