From be5ba222649970e50be6dc42ea08b78064a6cf6c Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Wed, 30 Sep 2026 04:21:23 +0200 Subject: [PATCH] Vectors: the variant renames itself and the legacy catalog publishes every schema it holds variant-slot-v3 overrides the variant's name, which the reader requires of a variant, so C# reads it and the others refuse the fifth slot. The legacy-layout catalog vectors carry an entry per schema, so a store the reader accepts differs from the one it refuses only by the bytes after it. missing-schema-v3 is refused by C# too. Co-Authored-By: Claude Sonnet 5.5 --- tests/vectors/document-variants-c0/generate.py | 7 ++++--- .../legacy-catalog-plain.msgpack | 2 +- .../legacy-catalog-trailing.msgpack | 2 +- .../readability/generate.py | 4 ++-- .../readability/manifest.txt | 2 +- .../readability/variant-slot-v3.bin | Bin 337 -> 350 bytes 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/vectors/document-variants-c0/generate.py b/tests/vectors/document-variants-c0/generate.py index b649475f..0965c106 100644 --- a/tests/vectors/document-variants-c0/generate.py +++ b/tests/vectors/document-variants-c0/generate.py @@ -42,9 +42,10 @@ write("extra-slot-full-payload.msgpack", [header, catalog, [anvil + [["item:bellows", []]]] + records[1:]]) variant = ["item:anvil-big", anvil[1], anvil[2], b"", ["item:anvil", [[0, [[1, ""]], "", 99]]]] write("variant-v2.msgpack", ["cultcache.store.v2", catalog, records + [variant]]) -legacy_entry = [catalog[0][0], catalog[0][1], catalog[0][2], catalog[0][4], None, catalog[0][3], []] +legacy = lambda entry: [entry[0], entry[1], entry[2], entry[4], None, entry[3], []] +legacy_entry = legacy(catalog[0]) write("legacy-catalog-extra-slot.msgpack", [header, [legacy_entry], [anvil + [["item:bellows", []]]]]) -write("legacy-catalog-plain.msgpack", [header, [legacy_entry], records]) +write("legacy-catalog-plain.msgpack", [header, [legacy(entry) for entry in catalog], records]) (here / "legacy-catalog-trailing.msgpack").write_bytes( - msgpack.packb([header, [legacy_entry], records], use_bin_type=True) + b"\x01\x02\x03") + msgpack.packb([header, [legacy(entry) for entry in catalog], records], use_bin_type=True) + b"\x01\x02\x03") diff --git a/tests/vectors/document-variants-c0/legacy-catalog-plain.msgpack b/tests/vectors/document-variants-c0/legacy-catalog-plain.msgpack index 6759a9b5..345d12f7 100644 --- a/tests/vectors/document-variants-c0/legacy-catalog-plain.msgpack +++ b/tests/vectors/document-variants-c0/legacy-catalog-plain.msgpack @@ -1,2 +1,2 @@ -“²cultcache.store.v1‘—ÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788µfixtures.precut2.item¸fixtures.precut2.item.v1Úp{"schemaName":"fixtures.precut2.item","schemaVersion":"fixtures.precut2.item.v1","members":[{"slot":0,"name":"Name","type":"System.String","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":true},{"slot":1,"name":"Count","type":"System.Int32","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":false}]}ÀÙGsha256:dadf30bc920849ee89ed5d70cc73027070dd7571c5f878db1901f3abc459cc0c�“”ªitem:anvilÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4032226+00:00Ä’¥anvil”¬item:bellowsÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4114746+00:00Ä +“²cultcache.store.v1’—ÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788µfixtures.precut2.item¸fixtures.precut2.item.v1Úp{"schemaName":"fixtures.precut2.item","schemaVersion":"fixtures.precut2.item.v1","members":[{"slot":0,"name":"Name","type":"System.String","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":true},{"slot":1,"name":"Count","type":"System.Int32","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":false}]}ÀÙGsha256:dadf30bc920849ee89ed5d70cc73027070dd7571c5f878db1901f3abc459cc0c�—ÙGsha256:670deacd06aedb90235e6bd873674c10467a05b4adcd62dbc019279efcbcbb11µfixtures.precut2.note¸fixtures.precut2.note.v1Ùç{"schemaName":"fixtures.precut2.note","schemaVersion":"fixtures.precut2.note.v1","members":[{"slot":0,"name":"Text","type":"System.String","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":false}]}ÀÙGsha256:8552c4cd5a0a455fc43a37c2314d28617b7b9d36e43ee7ef2dd18cb148dbfe35�“”ªitem:anvilÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4032226+00:00Ä’¥anvil”¬item:bellowsÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4114746+00:00Ä ’§bellows*”«note:originÙGsha256:670deacd06aedb90235e6bd873674c10467a05b4adcd62dbc019279efcbcbb11Ù!2026-09-13T15:14:36.4120244+00:00Ä‘´written before cut 2 \ No newline at end of file diff --git a/tests/vectors/document-variants-c0/legacy-catalog-trailing.msgpack b/tests/vectors/document-variants-c0/legacy-catalog-trailing.msgpack index 8c300126..2755f37c 100644 --- a/tests/vectors/document-variants-c0/legacy-catalog-trailing.msgpack +++ b/tests/vectors/document-variants-c0/legacy-catalog-trailing.msgpack @@ -1,2 +1,2 @@ -“²cultcache.store.v1‘—ÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788µfixtures.precut2.item¸fixtures.precut2.item.v1Úp{"schemaName":"fixtures.precut2.item","schemaVersion":"fixtures.precut2.item.v1","members":[{"slot":0,"name":"Name","type":"System.String","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":true},{"slot":1,"name":"Count","type":"System.Int32","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":false}]}ÀÙGsha256:dadf30bc920849ee89ed5d70cc73027070dd7571c5f878db1901f3abc459cc0c�“”ªitem:anvilÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4032226+00:00Ä’¥anvil”¬item:bellowsÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4114746+00:00Ä +“²cultcache.store.v1’—ÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788µfixtures.precut2.item¸fixtures.precut2.item.v1Úp{"schemaName":"fixtures.precut2.item","schemaVersion":"fixtures.precut2.item.v1","members":[{"slot":0,"name":"Name","type":"System.String","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":true},{"slot":1,"name":"Count","type":"System.Int32","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":false}]}ÀÙGsha256:dadf30bc920849ee89ed5d70cc73027070dd7571c5f878db1901f3abc459cc0c�—ÙGsha256:670deacd06aedb90235e6bd873674c10467a05b4adcd62dbc019279efcbcbb11µfixtures.precut2.note¸fixtures.precut2.note.v1Ùç{"schemaName":"fixtures.precut2.note","schemaVersion":"fixtures.precut2.note.v1","members":[{"slot":0,"name":"Text","type":"System.String","isReference":false,"many":false,"targetSchemaName":null,"indexAlias":null,"isName":false}]}ÀÙGsha256:8552c4cd5a0a455fc43a37c2314d28617b7b9d36e43ee7ef2dd18cb148dbfe35�“”ªitem:anvilÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4032226+00:00Ä’¥anvil”¬item:bellowsÙGsha256:88d3fdf0a927acf3b163940d8f8c7fe62b3316542ce771a67ec8bc038f594788Ù!2026-09-13T15:14:36.4114746+00:00Ä ’§bellows*”«note:originÙGsha256:670deacd06aedb90235e6bd873674c10467a05b4adcd62dbc019279efcbcbb11Ù!2026-09-13T15:14:36.4120244+00:00Ä‘´written before cut 2 \ No newline at end of file diff --git a/tests/vectors/document-variants-c2a/readability/generate.py b/tests/vectors/document-variants-c2a/readability/generate.py index 7680a886..2d94258f 100644 --- a/tests/vectors/document-variants-c2a/readability/generate.py +++ b/tests/vectors/document-variants-c2a/readability/generate.py @@ -37,8 +37,8 @@ vectors = { "header-only-v3": pack(["cultcache.store.v3"]), # v3-base with its schema catalog emptied: every record names a schema the store does not publish. "missing-schema-v3": pack([base[0], [], base[2]]), - # v3-base plus a variant of alpha: a fifth record slot, [baseKey, overrides[]], over an empty payload. Only C# reads it. - "variant-slot-v3": pack([base[0], base[1], base[2] + [["gamma"] + base[2][0][1:3] + [b"", ["alpha", []]]]]), + # v3-base plus a variant of alpha: a fifth record slot, [baseKey, overrides[]], over an empty payload, overriding the name. Only C# reads it. + "variant-slot-v3": pack([base[0], base[1], base[2] + [["gamma"] + base[2][0][1:3] + [b"", ["alpha", [[0, [[0, ""]], "", "gamma"]]]]]]), # v3-base with a fourth top-level slot after the records. "extra-top-slot": pack(base + [0]), } diff --git a/tests/vectors/document-variants-c2a/readability/manifest.txt b/tests/vectors/document-variants-c2a/readability/manifest.txt index 626d8d7b..d6c58813 100644 --- a/tests/vectors/document-variants-c2a/readability/manifest.txt +++ b/tests/vectors/document-variants-c2a/readability/manifest.txt @@ -20,5 +20,5 @@ bad-body-v3.bin refuses refuses refuses refuses header-only-v1.bin refuses refuses refuses refuses header-only-v3.bin refuses refuses refuses refuses extra-top-slot.bin refuses refuses refuses refuses -missing-schema-v3.bin reads refuses refuses refuses +missing-schema-v3.bin refuses refuses refuses refuses variant-slot-v3.bin reads refuses refuses refuses diff --git a/tests/vectors/document-variants-c2a/readability/variant-slot-v3.bin b/tests/vectors/document-variants-c2a/readability/variant-slot-v3.bin index f2f09047160246e87539eb8612655366b6002fcc..0a11869ccd99642c0aabb90a4f1883295fbadd06 100644 GIT binary patch delta 22 ecmcb}bdPC603+YTDGU=QF)UcHG(9mlHxU42?g;Y$ delta 9 Qcmcb|bdhO803+iB021#5MgRZ+