From c47904a43b438dc6212f10f3bc3dd657cfa73f1d Mon Sep 17 00:00:00 2001 From: Robert Kruszewski Date: Tue, 7 Jul 2026 22:50:22 +0100 Subject: [PATCH] Better error message in case of unknown encoding id Signed-off-by: Robert Kruszewski --- vortex-array/src/serde.rs | 2 +- vortex-layout/src/children.rs | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/vortex-array/src/serde.rs b/vortex-array/src/serde.rs index 637b57324c0..9fdf72f39fb 100644 --- a/vortex-array/src/serde.rs +++ b/vortex-array/src/serde.rs @@ -329,7 +329,7 @@ impl SerializedArray { if session.allows_unknown() { return self.decode_foreign(encoding_id, dtype, len, ctx); } - return Err(vortex_err!("Unknown encoding: {}", encoding_id)); + vortex_bail!("Unknown encoding: {}", encoding_id); }; let children = SerializedArrayChildren { diff --git a/vortex-layout/src/children.rs b/vortex-layout/src/children.rs index dade2cbc4a4..4903265890e 100644 --- a/vortex-layout/src/children.rs +++ b/vortex-layout/src/children.rs @@ -218,15 +218,14 @@ impl LayoutChildren for ViewedLayoutChildren { let encoding_id = self .layout_read_ctx .resolve(fb_child.encoding()) - .ok_or_else(|| vortex_err!("Encoding not found: {}", fb_child.encoding()))?; + .ok_or_else(|| { + vortex_err!("Unknown layout encoding index: {}", fb_child.encoding()) + })?; let Some(encoding) = self.layouts.find(&encoding_id) else { if self.allow_unknown { return viewed_children.foreign_layout_from_fb(fb_child, dtype); } - return Err(vortex_err!( - "Encoding not found in registry: {}", - fb_child.encoding() - )); + vortex_bail!("Unknown layout encoding: {encoding_id}"); }; let build_ctx = LayoutBuildContext {