Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align buffers from Python (FFI) #6472

Merged
merged 4 commits into from
Oct 2, 2024
Merged

Align buffers from Python (FFI) #6472

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64373a7
Align buffers in RecordBatch.from_pyarrow_bound
EnricoMi Sep 26, 2024
ac58cdc
Update arrow/src/pyarrow.rs
alamb Oct 2, 2024
1875d6d
cargo fmt
alamb Oct 2, 2024
a138910
Merge remote-tracking branch 'apache/master' into align-buffers-from-…
alamb Oct 2, 2024
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
3 changes: 2 additions & 1 deletion arrow/src/pyarrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,13 +363,14 @@ impl FromPyArrow for RecordBatch {

let schema_ptr = unsafe { schema_capsule.reference::<FFI_ArrowSchema>() };
let ffi_array = unsafe { FFI_ArrowArray::from_raw(array_capsule.pointer().cast()) };
let array_data = unsafe { ffi::from_ffi(ffi_array, schema_ptr) }.map_err(to_py_err)?;
let mut array_data = unsafe { ffi::from_ffi(ffi_array, schema_ptr) }.map_err(to_py_err)?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @EnricoMi -- this fix looks great to me (if the alternatives are error or copy the data, I think we should copy the data).

As @tustvold says ideally the C++ should properly align things but this seems reasonable to me

if !matches!(array_data.data_type(), DataType::Struct(_)) {
return Err(PyTypeError::new_err(
"Expected Struct type from __arrow_c_array.",
));
}
let options = RecordBatchOptions::default().with_row_count(Some(array_data.len()));
array_data.align_buffers();
alamb marked this conversation as resolved.
Show resolved Hide resolved
let array = StructArray::from(array_data);
// StructArray does not embed metadata from schema. We need to override
// the output schema with the schema from the capsule.
Expand Down
Loading