cultcache-py convert: delete the dead refused flag and guard; pin the late refusal path; README states the C# NaN-key bytes exactly
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
3b70479ffd
commit
d9f73281f0
3 changed files with 35 additions and 9 deletions
|
|
@ -251,8 +251,9 @@ python -m cultcache_py.interop read --file cache.cc
|
||||||
|
|
||||||
One deliberate exception to leaf acceptance following the reference: Python reads `float32` and `float64` map keys as
|
One deliberate exception to leaf acceptance following the reference: Python reads `float32` and `float64` map keys as
|
||||||
one float, so a map holding a `float32` NaN key beside a `float64` NaN key is refused on read and on write as
|
one float, so a map holding a `float32` NaN key beside a `float64` NaN key is refused on read and on write as
|
||||||
`duplicate_map_key`. C# writes and reads that map as two keys, as the bytes `82 ca ffc00000 01 cb fff8000000000000 02`
|
`duplicate_map_key`. C# reads that map as two keys, from the bytes `82 ca ffc00000 01 cb fff8000000000000 02` (fixint
|
||||||
(`float.NaN` and `double.NaN` keys with values 1 and 2); every pair of NaN keys of one width is refused by both runtimes.
|
values) and from the bytes it writes itself, `82 ca ffc00000 d2 00000001 cb fff8000000000000 d2 00000002` (`float.NaN`
|
||||||
|
and `double.NaN` keys with values 1 and 2, written as int32); every pair of NaN keys of one width is refused by both runtimes.
|
||||||
|
|
||||||
`packages/cultcache-ts/test/cult-cache.test.ts` includes Python in the shared
|
`packages/cultcache-ts/test/cult-cache.test.ts` includes Python in the shared
|
||||||
CultCache v1 parity matrix with TypeScript, Rust, and C#. `cultcache_py` ships
|
CultCache v1 parity matrix with TypeScript, Rust, and C#. `cultcache_py` ships
|
||||||
|
|
|
||||||
|
|
@ -622,13 +622,13 @@ def convert(
|
||||||
)
|
)
|
||||||
if destination.exists():
|
if destination.exists():
|
||||||
raise exists
|
raise exists
|
||||||
refused = False
|
target = None
|
||||||
failure: CultCacheError | None = None
|
failure: CultCacheError | None = None
|
||||||
try:
|
try:
|
||||||
try:
|
try:
|
||||||
target = open(destination, "xb")
|
target = open(destination, "xb")
|
||||||
except FileExistsError:
|
except FileExistsError:
|
||||||
refused = True
|
pass
|
||||||
else:
|
else:
|
||||||
with target:
|
with target:
|
||||||
converted: list[CultCacheEnvelope] = []
|
converted: list[CultCacheEnvelope] = []
|
||||||
|
|
@ -654,9 +654,8 @@ def convert(
|
||||||
target.flush()
|
target.flush()
|
||||||
os.fsync(target.fileno())
|
os.fsync(target.fileno())
|
||||||
except BaseException:
|
except BaseException:
|
||||||
if not refused:
|
destination.unlink(missing_ok=True)
|
||||||
destination.unlink(missing_ok=True)
|
|
||||||
raise
|
raise
|
||||||
if refused:
|
if target is None:
|
||||||
raise exists
|
raise exists
|
||||||
return count
|
return count
|
||||||
|
|
|
||||||
|
|
@ -335,8 +335,9 @@ class PayloadCodecTests(unittest.TestCase):
|
||||||
self.assertEqual((refusal.code, str(refusal)), ("value_kind", text.format("read")))
|
self.assertEqual((refusal.code, str(refusal)), ("value_kind", text.format("read")))
|
||||||
|
|
||||||
def test_mixed_width_nan_keys_are_a_documented_refusal(self) -> None:
|
def test_mixed_width_nan_keys_are_a_documented_refusal(self) -> None:
|
||||||
# The bytes the C# reference writes for a map holding float.NaN and double.NaN keys: it reads them as two keys.
|
# The bytes C# accepts for a map holding float.NaN and double.NaN keys (two keys); it writes the values as int32.
|
||||||
row = "82 ca ffc00000 01 cb fff8000000000000 02"
|
row = "82 ca ffc00000 01 cb fff8000000000000 02"
|
||||||
|
written = "82 ca ffc00000 d2 00000001 cb fff8000000000000 d2 00000002"
|
||||||
with self.assertRaises(PayloadCodecFault) as caught:
|
with self.assertRaises(PayloadCodecFault) as caught:
|
||||||
MESSAGEPACK_PAYLOAD_CODEC.decode(bytes.fromhex(row))
|
MESSAGEPACK_PAYLOAD_CODEC.decode(bytes.fromhex(row))
|
||||||
self.assertEqual((caught.exception.code, caught.exception.kind), ("duplicate_map_key", ""))
|
self.assertEqual((caught.exception.code, caught.exception.kind), ("duplicate_map_key", ""))
|
||||||
|
|
@ -346,6 +347,10 @@ class PayloadCodecTests(unittest.TestCase):
|
||||||
section = readme.split("## Wire Parity", 1)[1].split("\n## ", 1)[0]
|
section = readme.split("## Wire Parity", 1)[1].split("\n## ", 1)[0]
|
||||||
self.assertIn("duplicate_map_key", section)
|
self.assertIn("duplicate_map_key", section)
|
||||||
self.assertIn(row, section)
|
self.assertIn(row, section)
|
||||||
|
self.assertIn(written, section)
|
||||||
|
with self.assertRaises(PayloadCodecFault) as caught:
|
||||||
|
MESSAGEPACK_PAYLOAD_CODEC.decode(bytes.fromhex(written))
|
||||||
|
self.assertEqual(caught.exception.code, "duplicate_map_key")
|
||||||
|
|
||||||
def test_every_nan_key_is_one_key_both_ways(self) -> None:
|
def test_every_nan_key_is_one_key_both_ways(self) -> None:
|
||||||
from cultcache_py.leaves import Float32
|
from cultcache_py.leaves import Float32
|
||||||
|
|
@ -918,20 +923,41 @@ class ConvertTests(unittest.TestCase):
|
||||||
taken.push(CultCacheEnvelope.create(key="k", type="tests.mig", payload=b'{"n": 1}'))
|
taken.push(CultCacheEnvelope.create(key="k", type="tests.mig", payload=b'{"n": 1}'))
|
||||||
store.push(CultCacheEnvelope.create(key="k", type="tests.mig", payload=b'{"n": 1}'))
|
store.push(CultCacheEnvelope.create(key="k", type="tests.mig", payload=b'{"n": 1}'))
|
||||||
missing = type(store)(folder / f"{CANARY}-missing")
|
missing = type(store)(folder / f"{CANARY}-missing")
|
||||||
|
dangling = folder / f"{CANARY}-dangling"
|
||||||
|
os.symlink(folder / f"{CANARY}-nowhere", dangling)
|
||||||
|
raced = folder / f"{CANARY}-raced"
|
||||||
|
real_exists = Path.exists
|
||||||
|
|
||||||
|
def exists_then_created(path):
|
||||||
|
if path == raced:
|
||||||
|
raced.write_bytes(b"raced")
|
||||||
|
return False
|
||||||
|
return real_exists(path)
|
||||||
|
|
||||||
for expected, call in (
|
for expected, call in (
|
||||||
(SOURCE_MISSING, lambda: convert(missing, folder / f"{CANARY}-out", definitions)),
|
(SOURCE_MISSING, lambda: convert(missing, folder / f"{CANARY}-out", definitions)),
|
||||||
(DESTINATION_EXISTS, lambda: convert(store, taken.path, definitions)),
|
(DESTINATION_EXISTS, lambda: convert(store, taken.path, definitions)),
|
||||||
|
# The late refusal: the create itself finds the destination (a dangling symlink, or a creator
|
||||||
|
# racing between the existence check and the create).
|
||||||
|
(DESTINATION_EXISTS, lambda: convert(store, dangling, definitions)),
|
||||||
|
(DESTINATION_EXISTS, lambda: self._convert_racing(exists_then_created, store, raced, definitions)),
|
||||||
):
|
):
|
||||||
with self.assertRaises(CultCacheError) as caught:
|
with self.assertRaises(CultCacheError) as caught:
|
||||||
call()
|
call()
|
||||||
refusal = caught.exception
|
refusal = caught.exception
|
||||||
self.assertEqual(str(refusal), expected)
|
self.assertEqual(str(refusal), expected)
|
||||||
for text in (str(refusal), repr(refusal), repr(refusal.args), repr(vars(refusal)), _chain_text(refusal)):
|
notes = repr(getattr(refusal, "__notes__", None))
|
||||||
|
for text in (str(refusal), repr(refusal), repr(refusal.args), repr(vars(refusal)), notes, _chain_text(refusal)):
|
||||||
self.assertNotIn(CANARY, text)
|
self.assertNotIn(CANARY, text)
|
||||||
self.assertNotIn(str(folder), text)
|
self.assertNotIn(str(folder), text)
|
||||||
self.assertIsNone(refusal.__context__)
|
self.assertIsNone(refusal.__context__)
|
||||||
self.assertIsNone(refusal.__cause__)
|
self.assertIsNone(refusal.__cause__)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _convert_racing(exists, store, destination, definitions):
|
||||||
|
with mock.patch.object(Path, "exists", exists):
|
||||||
|
return convert(store, destination, definitions)
|
||||||
|
|
||||||
def _one_record(self, label, name):
|
def _one_record(self, label, name):
|
||||||
store = self._filled(dict(self._stores())[label], name, {"k1": b'{"n": 1}'})
|
store = self._filled(dict(self._stores())[label], name, {"k1": b'{"n": 1}'})
|
||||||
return store, self.directory / f"{name}.out", [define_document_type("tests.mig")]
|
return store, self.directory / f"{name}.out", [define_document_type("tests.mig")]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue