diff --git a/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs b/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs index 20a04b69..9484abf2 100644 --- a/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs +++ b/src/GameCult.Caching.MessagePack/DirectoryMessagePackBackingStore.cs @@ -254,6 +254,7 @@ public sealed class DirectoryMessagePackBackingStore : CacheBackingStore key => HeldAt(key) is { } held && Foreign(held, currentManifest.SchemaCatalog) == null ? LoadPage(held, currentManifest.SchemaCatalog, out _, out _) : null, + key => HeldAt(key) is { } held ? Foreign(held, currentManifest.SchemaCatalog) : null, key => { _dirtyKeys.TryRemove(key, out _); diff --git a/src/GameCult.Caching/CultCache.cs b/src/GameCult.Caching/CultCache.cs index fa586e73..2c2996fc 100644 --- a/src/GameCult.Caching/CultCache.cs +++ b/src/GameCult.Caching/CultCache.cs @@ -3659,11 +3659,12 @@ namespace GameCult.Caching // The apply half of rule 3, for every store kind, checked where the write lands under the store's lock. A key this write names // whose durable record is under an id no registered type declares is refused, every such key at once, through Refuse, which - // reloads it as the store holds it: dropped when foreign, held read-only when a type reads it. + // reloads it as the store holds it: listed foreign when no type reads it, held read-only when one does. protected void RefuseUndeclaredOnDisk( IEnumerable written, Func undeclaredAt, Func durableAt, + Func foreignAt, Action unstage, bool cacheless = false) { @@ -3674,26 +3675,35 @@ namespace GameCult.Caching .ToArray(); if (refused.Length == 0) return; - Refuse(refused.Select(record => record.Key), durableAt, unstage, inner => Overwrites(inner, refused, cacheless)); + Refuse(refused.Select(record => record.Key), durableAt, foreignAt, unstage, inner => Overwrites(inner, refused, cacheless)); } /// /// The one refusal of a write, for every store kind: it reloads what it refuses, or changes nothing. For each key, /// gives the durable record decoded as a load would (null when the store holds none, or holds - /// it as a foreign record). What differs from this store's view is handed to , the path a pull uses; - /// only when that succeeds does the store forget its staged change at each key () and take the - /// loaded and dropped records into its view. If the reload throws, nothing has changed and the refusal carries that + /// it as a foreign record), and the foreign record it holds there, if any. What differs from this + /// store's view is handed to , the path a pull uses; only when that succeeds does the store forget its + /// staged change at each key (), take the loaded and dropped records into its view, and list the + /// keys' foreign records as a pull lists them. If the reload throws, nothing has changed and the refusal carries that /// exception. Always throws what returns. /// - protected void Refuse(IEnumerable keys, Func durableAt, Action unstage, Func refusal) + protected void Refuse( + IEnumerable keys, + Func durableAt, + Func foreignAt, + Action unstage, + Func refusal) { var refused = keys.Distinct(StringComparer.Ordinal).OrderBy(key => key, StringComparer.Ordinal).ToArray(); var loaded = new List(); var dropped = new List(); + var foreign = new List(); try { foreach (var key in refused) { + if (foreignAt(key) is { } carried) + foreign.Add(carried); Entries.TryGetValue(key, out var held); var durable = durableAt(key); if (durable == null) @@ -3719,6 +3729,7 @@ namespace GameCult.Caching Entries.TryRemove(held.Key.Value, out _); foreach (var stored in loaded) Entries[stored.Key.Value] = stored; + SetForeignRecords(_foreignRecords.Where(record => !refused.Contains(record.Key, StringComparer.Ordinal)).Concat(foreign)); throw refusal(null); } @@ -4130,6 +4141,7 @@ namespace GameCult.Caching Refuse( recordKeys.Concat(changedKeys), key => Cache == null ? null : DurableAt(durable, key), + key => ForeignAt(durable, key), key => { _staged.Remove(key); @@ -4154,21 +4166,28 @@ namespace GameCult.Caching } // A cache declares through its registry. A cacheless CultMesh write declares the ids of the catalog entry it writes: its own id - // and the ids it lists compatible. A refused key's durable version is what this store has now read of it. - private void RefuseUndeclaredOnDisk(Durable? durable, IReadOnlyCollection upserts, IReadOnlyCollection removals) + // and the ids it lists compatible. + private void RefuseUndeclaredOnDisk(Durable? durable, IReadOnlyCollection upserts, IReadOnlyCollection removals) => + RefuseUndeclaredOnDisk( + durable, + _staged.Concat(upserts.Select(staged => staged.Record.Key)).Concat(removals), + Cache != null + ? Registry.Declares + : id => upserts.Any(staged => + string.Equals(staged.Entry.SchemaId, id, StringComparison.Ordinal) || + staged.Entry.CompatibleSchemaIds.Contains(id, StringComparer.Ordinal))); + + // A refused key's durable version is what this store has now read of it. + private void RefuseUndeclaredOnDisk(Durable? durable, IEnumerable written, Func declares) { - Func declares = Cache != null - ? Registry.Declares - : id => upserts.Any(staged => - string.Equals(staged.Entry.SchemaId, id, StringComparison.Ordinal) || - staged.Entry.CompatibleSchemaIds.Contains(id, StringComparer.Ordinal)); var undeclared = UndeclaredOnDisk(durable, declares); if (undeclared.Count == 0) return; RefuseUndeclaredOnDisk( - _staged.Concat(upserts.Select(staged => staged.Record.Key)).Concat(removals), + written, key => undeclared.TryGetValue(key, out var carried) ? carried : null, key => Cache == null ? null : DurableAt(durable, key), + key => ForeignAt(durable, key), key => { _staged.Remove(key); @@ -4191,6 +4210,12 @@ namespace GameCult.Caching return undeclared; } + // The durable record at a key as a load lists it when no registered type claims its id; null otherwise. + private CultForeignRecord? ForeignAt(Durable? durable, string key) => + durable?.Snapshot.Records.FirstOrDefault(candidate => string.Equals(candidate.Key, key, StringComparison.Ordinal)) is { } record + ? Foreign(record, durable.Snapshot.SchemaCatalog) + : null; + // The durable record at a key decoded as a load decodes it, at its durable version: null when the store holds none there or // holds it foreign. The one decode both refusals reload through. private CultStoredDocument? DurableAt(Durable? durable, string key) diff --git a/tests/GameCult.Caching.Tests/ForeignRecordTests.cs b/tests/GameCult.Caching.Tests/ForeignRecordTests.cs index 45cce047..e77431d2 100644 --- a/tests/GameCult.Caching.Tests/ForeignRecordTests.cs +++ b/tests/GameCult.Caching.Tests/ForeignRecordTests.cs @@ -194,10 +194,10 @@ namespace GameCult.Caching.Tests } // Another writer replaced a record this cache holds with a record of a type it does not have. A write that would lay this - // cache's record over it is refused; the file keeps the other writer's record. - [TestCase(false)] - [TestCase(true)] - public void AWriteOverARecordAnotherWriterMadeForeignIsRefused(bool directory) + // cache's record over it is refused; the file keeps the other writer's record. The refusal reloads it as a pull would: the + // store lists it foreign, so the next write of it is refused before staging. + [Test] + public void AWriteOverARecordAnotherWriterMadeForeignIsRefused([Values] bool directory, [Values(Write.Flush, Write.Commit)] Write write) { var path = Seeded("replaced.cc", directory); using var cache = Open(path, DeckOnly, directory); @@ -205,11 +205,14 @@ namespace GameCult.Caching.Tests other.Commit(batch => batch.Upsert(Widget, WidgetOf("now a widget"), D)); var before = Fingerprint(path); - var refusal = Assert.Throws(() => Land(cache, Write.Flush, D, DeckOf(Canary)))!; + var refusal = Assert.Throws(() => Land(cache, write, D, DeckOf(Canary)))!; Assert.That(refusal.RecordKey, Is.EqualTo(D.Value)); Assert.That(refusal.Message, Does.Not.Contain(Canary)); Assert.That(Fingerprint(path), Is.EqualTo(before)); + Assert.That(StoreOf(cache).ForeignRecords.Select(record => record.Key), Is.EqualTo(new[] { "d", "w" })); + Assert.Throws(() => cache.UpsertAsync(Deck, DeckOf(Canary), D).GetAwaiter().GetResult()); + Assert.That(cache.IsDirty, Is.False); } // A refusal does not poison the store: what the cache held for the refused record goes with the refusal, so a later write