GameCult/CultLib
Watch
9
0
Fork
You've already forked CultLib
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Single-file judge: the removals need not travel as checks (a removal has no upsert); pin the flatten and retype refusal texts

Browse source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-10-28 06:39:26 +01:00
commit c8563e533f
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/GameCult.Caching/CultCache.cs
View file

@ -4872,7 +4872,7 @@ namespace GameCult.Caching
durable,
_staged.Concat(upserts.Select(staged => staged.Record.Key)).Concat(removals).Concat(checks).Concat(StagedChecks),
upserts,
checks.Concat(removals));
checks);
// A key the write also names as a removal or check (the request's, or one the cache removed here since its last flush) is a
// retype's removal half: it is judged by the removal rule, and the record staged there then lands. A refused key's durable

11
tests/GameCult.Caching.Tests/RetypeEvictionTests.cs
View file

@ -251,11 +251,12 @@ namespace GameCult.Caching.Tests
batch.UpsertVariant(K3, baseA, new[] { cache.Override<EvA>(nameof(EvA.Name), "v3") });
});
Assert.Throws<InvalidOperationException>(() => cache.Commit(batch =>
var flatten = Assert.Throws<InvalidOperationException>(() => cache.Commit(batch =>
{
batch.Remove(K3);
batch.Flatten(K3);
}));
}))!;
Assert.That(flatten.Message, Does.Contain("Flatten(k3)").And.Contain("not a variant"));
Assert.That(cache.GetStored(K3)!.Variant, Is.Not.Null, "the refused batch changed nothing");
Assert.That(cache.Remove(K3), Is.True);
Assert.Throws<InvalidOperationException>(() => cache.FlattenAsync(K3).GetAwaiter().GetResult());
@ -305,11 +306,13 @@ namespace GameCult.Caching.Tests
using var cache = Open(NewPath(kind), kind, AB);
PutB(cache, K2);
Assert.Throws<CultSchemaConflictException>(() => cache.Commit(batch =>
var refused = Assert.Throws<CultSchemaConflictException>(() => cache.Commit(batch =>
{
batch.Upsert(typeof(EvA), new EvA { Name = "k2", Value = 1 }, K2);
batch.Upsert(typeof(EvA), new EvA { Name = "k2", Value = 2 }, K2);
}));
}))!;
if (kind == "storeless")
Assert.That(refused.Message, Does.Contain("would retype the key").And.Contain("Remove the record first, in the same batch or an earlier commit, then add the other type's."));
Assert.That(cache.GetStored(K2)!.Descriptor.DocumentType, Is.EqualTo(typeof(EvB)));
}