C#: compatible schema ids publish a schema on open, Mesh takes only the older layout, the refusal names its file
A record whose schema id the catalog lists only as a compatible id now opens (the cache resolved a persisted schema by entry id alone). CultMesh's fallback to the older catalog-entry reader fires only for a store in that layout, decided by the entry's slot 5, not for any decode failure, so a current-layout store with a malformed slot is refused as CultCache refuses it. CultStoreUnreadableException.Path names the refused file. New vectors: compatible-id-only-v3 (accepted by all four) and three current-layout catalogs with one malformed slot. The contract states the writer's invariant. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
d5bc28e207
commit
969d78de39
16 changed files with 118 additions and 16 deletions
|
|
@ -270,10 +270,9 @@ namespace GameCult.Mesh
|
|||
WriteFileAtomically(path, CultDocumentMessagePackSerialization.SerializeSnapshot(snapshot));
|
||||
}
|
||||
|
||||
// Every refusal is a CultStoreUnreadableException. A store whose catalog entries are in the older layout is read by the
|
||||
// same store reader with the older entry reader, so it is judged by the same framing, slot count and records. Only a
|
||||
// catalog entry the current layout cannot decode (a MessagePack or shape failure) sends it there; a store refused for its
|
||||
// framing, its slot count or a record keeps that refusal.
|
||||
// Every refusal is a CultStoreUnreadableException naming the file. A store whose catalog entries are in the older layout is
|
||||
// read by the same store reader with the older entry reader, so it is judged by the same framing, slot count and records.
|
||||
// Only a store that is in the older layout goes there; any other refusal stands as the current reader gave it.
|
||||
private static CultPersistedStoreSnapshot ReadSingleFileSnapshot(string path)
|
||||
{
|
||||
var bytes = File.ReadAllBytes(path);
|
||||
|
|
@ -282,17 +281,55 @@ namespace GameCult.Mesh
|
|||
CultPersistedStoreSnapshot snapshot;
|
||||
try
|
||||
{
|
||||
snapshot = CultDocumentMessagePackSerialization.DeserializeSnapshot(bytes);
|
||||
try
|
||||
{
|
||||
snapshot = CultDocumentMessagePackSerialization.DeserializeSnapshot(bytes);
|
||||
}
|
||||
catch (CultStoreUnreadableException) when (HasOlderCatalogLayout(bytes))
|
||||
{
|
||||
snapshot = CultDocumentMessagePackSerialization.ReadStore(bytes, ReadLegacySchemaCatalogEntry);
|
||||
}
|
||||
|
||||
CultDocumentMessagePackSerialization.RequireSingleFileFormat(snapshot);
|
||||
}
|
||||
catch (CultStoreUnreadableException ex) when (ex.InnerException is MessagePackSerializationException or InvalidOperationException)
|
||||
catch (CultStoreUnreadableException ex) when (ex.Path == null)
|
||||
{
|
||||
snapshot = CultDocumentMessagePackSerialization.ReadStore(bytes, ReadLegacySchemaCatalogEntry);
|
||||
throw new CultStoreUnreadableException(ex.Message, path, ex.InnerException);
|
||||
}
|
||||
|
||||
CultDocumentMessagePackSerialization.RequireSingleFileFormat(snapshot);
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
// The older layout puts the content hash, a string, at catalog entry slot 5, where the current layout has the array of
|
||||
// compatible schema ids.
|
||||
private static bool HasOlderCatalogLayout(byte[] bytes)
|
||||
{
|
||||
try
|
||||
{
|
||||
var reader = new MessagePackReader(bytes);
|
||||
if (reader.ReadArrayHeader() != 3)
|
||||
return false;
|
||||
reader.Skip();
|
||||
var entries = reader.ReadArrayHeader();
|
||||
for (var entry = 0; entry < entries; entry++)
|
||||
{
|
||||
var fields = reader.ReadArrayHeader();
|
||||
for (var field = 0; field < fields; field++)
|
||||
{
|
||||
if (field == 5 && reader.NextMessagePackType == MessagePackType.String)
|
||||
return true;
|
||||
reader.Skip();
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
catch (Exception ex) when (ex is EndOfStreamException or MessagePackSerializationException or InvalidOperationException)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static CultSchemaCatalogEntry ReadLegacySchemaCatalogEntry(ref MessagePackReader reader)
|
||||
{
|
||||
var fieldCount = reader.ReadArrayHeader();
|
||||
|
|
|
|||
Loading…
Reference in a new issue