Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vortex-array/src/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions vortex-layout/src/children.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading