eric/notarius
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve D&D registry caching and retire the completed roadmap

Browse Source
This commit is contained in:
Eric Rakestraw
2026-08-04 18:29:17 +00:00
parent f5fd115046
commit 29fcad6e9b
7 changed files with 96 additions and 956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
internal/modules/dnd/locations/registry/registry_test.go
View File

@@ -2,9 +2,7 @@ package registry
import (
"bytes"
"fmt"
"strings"
"sync"
"testing"
"gitea.maximumdirect.net/eric/notarius/internal/core/source"
@@ -100,26 +98,19 @@ func TestResolveRejectsInvalidReferenceInputs(t *testing.T) {
}
}
func TestResolverValidatesStaticAndOperationReferences(t *testing.T) {
func TestResolverHandlesConstructionAndOperationReferences(t *testing.T) {
placeholder, err := NewResolver(referenceSet())
if err != nil || placeholder.Seeded().Bound() {
t.Fatalf("generated placeholder = %#v, %v; want unbound seed", placeholder, err)
}
validContent := encodeList(t, registryFixture())
invalidSets := []contracts.ReferenceSet{
referenceSet(item([]byte(`{"locations":[`))),
referenceSet(contracts.ReferenceItem{MediaType: "text/plain", Content: validContent}),
referenceSet(item(make([]byte, MaxBytes+1))),
referenceSet(item(validContent), item(validContent)),
malformed := referenceSet(item([]byte(`{"locations":[`)))
if _, err := NewResolver(malformed); err == nil {
t.Fatal("NewResolver(malformed) error = nil")
}
for index, references := range invalidSets {
if _, err := NewResolver(references); err == nil {
t.Fatalf("NewResolver(invalid %d) error = nil", index)
}
if _, err := placeholder.Resolve(references); err == nil {
t.Fatalf("Resolve(invalid %d) error = nil", index)
}
if _, err := placeholder.Resolve(malformed); err == nil {
t.Fatal("Resolve(malformed) error = nil")
}
staticContent := append([]byte(nil), validContent...)
@@ -137,9 +128,12 @@ func TestResolverValidatesStaticAndOperationReferences(t *testing.T) {
if seeded.Seeded().Count() != 2 || seeded.Seeded().CanonicalBytes()[0] != '{' {
t.Fatalf("seeded registry retained construction references: %#v", seeded.Seeded())
}
if fallback, err := seeded.Resolve(contracts.ReferenceSet{}); err != nil || fallback != seeded.Seeded() {
t.Fatalf("fallback = %#v, %v; want seeded registry", fallback, err)
}
}
func TestResolverCachesEquivalentRegistriesConcurrentlyAndIgnoresCallerDigest(t *testing.T) {
func TestResolverReusesEquivalentCanonicalRegistries(t *testing.T) {
resolver, err := NewResolver(referenceSet())
if err != nil {
t.Fatal(err)
@@ -153,57 +147,11 @@ func TestResolverCachesEquivalentRegistriesConcurrentlyAndIgnoresCallerDigest(t
if err != nil {
t.Fatal(err)
}
second, err := resolver.Resolve(firstSet)
if err != nil || first != second {
t.Fatalf("raw cache Resolve() = %p, %p, %v", first, second, err)
}
spaced := append([]byte("\n "), content...)
spaced = append(spaced, '\n')
third, err := resolver.Resolve(referenceSet(contracts.ReferenceItem{MediaType: "APPLICATION/JSON; charset=utf-8", Content: spaced}))
if err != nil || third != first {
t.Fatalf("semantic cache Resolve() = %p, %p, %v", first, third, err)
}
var group sync.WaitGroup
errs := make(chan error, 24)
for range 24 {
group.Add(1)
go func() {
defer group.Done()
resolved, err := resolver.Resolve(firstSet)
if err != nil || resolved != first {
errs <- fmt.Errorf("resolved %p, want %p: %w", resolved, first, err)
}
}()
}
group.Wait()
close(errs)
for err := range errs {
t.Error(err)
}
sharedDigest := "sha256:" + strings.Repeat("0", 64)
firstItem := contracts.ReferenceItem{MediaType: locationcodec.MediaType, Content: content, Digest: sharedDigest}
otherList := registryFixture()
otherList.Locations[0].Name = "Moon Gate"
otherList.Locations[0].ID = identity.DeriveID(otherList.Locations[0].Name, otherList.Locations[0].SourceRefs)
otherContent := encodeList(t, otherList)
otherItem := contracts.ReferenceItem{MediaType: locationcodec.MediaType, Content: otherContent, Digest: sharedDigest}
byDigestFirst, err := resolver.Resolve(referenceSet(firstItem))
if err != nil {
t.Fatal(err)
}
byDigestOther, err := resolver.Resolve(referenceSet(otherItem))
if err != nil || byDigestFirst == byDigestOther || byDigestFirst.Digest() == byDigestOther.Digest() {
t.Fatalf("caller digest aliased different registries: %p / %p, %v", byDigestFirst, byDigestOther, err)
}
firstSet.Slots[ReferenceSlot].Items[0].Content[0] = '['
if got, ok := first.Lookup(registryFixture().Locations[0].ID); !ok || got.Name != "The Tavern" {
t.Fatalf("cached registry retained caller bytes: %#v, %t", got, ok)
}
if fallback, err := resolver.Resolve(contracts.ReferenceSet{}); err != nil || fallback != resolver.Seeded() || fallback.Bound() {
t.Fatalf("fallback = %#v, %v; want unbound seed", fallback, err)
second, err := resolver.Resolve(referenceSet(contracts.ReferenceItem{MediaType: "APPLICATION/JSON; charset=utf-8", Content: spaced}))
if err != nil || second != first {
t.Fatalf("equivalent canonical registry = %p / %p, %v", first, second, err)
}
}