Skip to content

Commit e73449b

Browse files
authored
build(deps): pin vortex to a patched fork for #468/#472 (#481)
Temporarily patches all 27 vortex crates to gerchowl/vortex@608d8a1 (tag 0.75.0 + the #468 side-effect-free is_sorted assert + the #472 canonical-NaN float sum + version surgery), pinned by full SHA on a protected branch. cargo-deny denies unknown git sources and allows only that fork. The #468 guard now asserts one byte count per shape across profiles; a new #472 guard asserts the canonical NaN in sealed bytes. Conformance corpus byte-identical; Gate B snapshots change only by the source tag. Upstream: vortex-data/vortex#10119/#10121 and #10120/#10122. Removal tracked in #480. Refs: #468, #472
1 parent d6788f1 commit e73449b

13 files changed

Lines changed: 642 additions & 556 deletions

File tree

‎flake.nix‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,20 @@
368368
exit 1
369369
fi
370370
371-
# The #468 reproducer asserts the two known per-`debug_assertions` byte counts, so running
372-
# it in both profiles pins both. It FAILS when upstream fixes the bug — deliberately, so
373-
# the `tessera-ingest` fixture workaround gets removed rather than forgotten.
374-
echo "[#468] the known-limitation reproducer under both profiles" >&2
375-
cargo test -q -p tessera-io --lib known_limitation_468
376-
cargo test -q --release -p tessera-io --lib known_limitation_468
371+
# #468 is FIXED (carried by the vortex fork pin, #480). The test now asserts ONE byte
372+
# count per shape with no `cfg!(debug_assertions)` branch, so running it in both profiles
373+
# is what proves the two agree: a re-divergence fails in exactly one of these two lines.
374+
echo "[#468] the build-config independence guard under both profiles" >&2
375+
cargo test -q -p tessera-io --lib full_span_int_container_bytes_are_build_config_independent
376+
cargo test -q --release -p tessera-io --lib full_span_int_container_bytes_are_build_config_independent
377+
378+
# #472's guard (the arch-dependent half): the persisted float Sum must be the canonical
379+
# NaN, not x86_64's default. Run in both profiles for symmetry with the above, though
380+
# this one's axis is the architecture — the aarch64 leg of this matrix is what pairs
381+
# with it, and aarch64 cannot fail it (it always produced the canonical value).
382+
echo "[#472] the canonical-NaN Sum guard under both profiles" >&2
383+
cargo test -q -p tessera-io --lib float_sum_stat_is_canonical_nan_not_the_platform_default
384+
cargo test -q --release -p tessera-io --lib float_sum_stat_is_canonical_nan_not_the_platform_default
377385
'';
378386
});
379387

‎tessera/Cargo.lock‎

Lines changed: 27 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tessera/Cargo.toml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,52 @@ tessera-ingest = { path = "crates/tessera-ingest" }
9494
[profile.dist]
9595
inherits = "release"
9696
lto = "thin"
97+
98+
# --- vortex fork pin (#480 tracks removal) -------------------------------------------------------
99+
# vortex 0.75.0 has two determinism defects that both leak a WRITE-TIME STATISTIC into the
100+
# serialised bytes, so the sealed `content_hash` stops being a function of the data alone:
101+
#
102+
# #468 the `debug_assertions`-gated `is_sorted` assert on patch indices caches `Stat::IsSorted`
103+
# on them, so a debug-built writer emitted 24 bytes more than a release-built one.
104+
# #472 `sum_float_all` skips NaN, so a column holding both `+inf` and `-inf` evaluates
105+
# `inf + -inf`; the resulting default NaN is `0xfff8…` on x86_64 and `0x7ff8…` on aarch64,
106+
# and `Stat::Sum` is persisted — so the bytes depended on the writing host.
107+
#
108+
# Pinned to a FULL COMMIT SHA, never a branch name: a branch would let the pinned content move
109+
# underneath a lockfile that still looks unchanged.
110+
#
111+
# Every vortex crate must be patched TOGETHER. Patching `vortex-array` alone leaves its siblings
112+
# resolving from crates.io, which yields two copies of `vortex-proto`/`vortex-buffer` and ~1000 type
113+
# errors. The fork branch also carries one non-upstream commit setting the workspace version to
114+
# 0.75.0: the tag ships the placeholder 0.1.0, and without that commit cargo reports
115+
# `patch ... was not used in the crate graph` and SILENTLY keeps using crates.io.
116+
#
117+
# REMOVE THIS BLOCK once a released vortex contains both fixes — see #480 for the checklist.
118+
[patch.crates-io]
119+
vortex-alp = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
120+
vortex-array = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
121+
vortex-array-macros = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
122+
vortex-btrblocks = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
123+
vortex-buffer = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
124+
vortex-bytebool = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
125+
vortex-compressor = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
126+
vortex-datetime-parts = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
127+
vortex-decimal-byte-parts = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
128+
vortex-error = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
129+
vortex-fastlanes = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
130+
vortex-file = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
131+
vortex-flatbuffers = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
132+
vortex-fsst = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
133+
vortex-io = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
134+
vortex-layout = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
135+
vortex-mask = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
136+
vortex-metrics = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
137+
vortex-pco = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
138+
vortex-proto = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
139+
vortex-runend = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
140+
vortex-scan = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
141+
vortex-sequence = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
142+
vortex-session = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
143+
vortex-sparse = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
144+
vortex-utils = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }
145+
vortex-zigzag = { git = "https://github.com/gerchowl/vortex", rev = "608d8a1162cf40dbea70f8dd72781ec243754282" }

0 commit comments

Comments
 (0)