NotAShelf/ncro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cache: include nar_url in ListRecentRoutes; test expired TTL in GetRouteByNarURL

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I952d08726f34d0d9b7c4c1880d60222c6a6a6964
This commit is contained in:
raf 2026-03-06 22:00:29 +03:00
commit ded9b6d464
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/cache/db.go vendored
View file

@ -197,7 +197,7 @@ func (d *DB) ExpireOldRoutes() error {
// Returns up to n non-expired routes ordered by most-recently-verified. // Returns up to n non-expired routes ordered by most-recently-verified.
func (d *DB) ListRecentRoutes(n int) ([]RouteEntry, error) { func (d *DB) ListRecentRoutes(n int) ([]RouteEntry, error) {
rows, err := d.db.Query(` rows, err := d.db.Query(`
SELECT store_path, upstream_url, latency_ema, last_verified, ttl, nar_hash, nar_size SELECT store_path, upstream_url, latency_ema, last_verified, ttl, nar_hash, nar_size, nar_url
FROM routes WHERE ttl > ? ORDER BY last_verified DESC LIMIT ?`, FROM routes WHERE ttl > ? ORDER BY last_verified DESC LIMIT ?`,
time.Now().Unix(), n) time.Now().Unix(), n)
if err != nil { if err != nil {
@ -210,7 +210,7 @@ func (d *DB) ListRecentRoutes(n int) ([]RouteEntry, error) {
var lastVerifiedUnix, ttlUnix int64 var lastVerifiedUnix, ttlUnix int64
if err := rows.Scan( if err := rows.Scan(
&e.StorePath, &e.UpstreamURL, &e.LatencyEMA, &e.StorePath, &e.UpstreamURL, &e.LatencyEMA,
&lastVerifiedUnix, &ttlUnix, &e.NarHash, &e.NarSize, &lastVerifiedUnix, &ttlUnix, &e.NarHash, &e.NarSize, &e.NarURL,
); err != nil { ); err != nil {
return nil, err return nil, err
} }

18
internal/cache/db_test.go vendored
View file

@ -276,6 +276,24 @@ func TestGetRouteByNarURL(t *testing.T) {
if got2 != nil { if got2 != nil {
t.Error("expected nil for missing NarURL") t.Error("expected nil for missing NarURL")
} }
// Expired entry must not be returned (tests the AND ttl > ? predicate).
expired := &cache.RouteEntry{
StorePath: "abc456",
UpstreamURL: "https://cache.nixos.org",
NarURL: "nar/abc456.nar.xz",
TTL: time.Now().Add(-time.Hour), // already in the past
}
if err := db.SetRoute(expired); err != nil {
t.Fatalf("SetRoute expired: %v", err)
}
got3, err := db.GetRouteByNarURL("nar/abc456.nar.xz")
if err != nil {
t.Fatalf("GetRouteByNarURL for expired: %v", err)
}
if got3 != nil {
t.Error("GetRouteByNarURL should return nil for an expired entry")
}
} }
func TestLRUEviction(t *testing.T) { func TestLRUEviction(t *testing.T) {