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

Align buffers of array data imported through the FFI if they aren't aligned #7137

Closed
wants to merge 2 commits into from
Closed

Align buffers of array data imported through the FFI if they aren't aligned #7137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a21978e
ffi_stream.rs: Align buffers when importing arrays
felipecrv Feb 15, 2025
4895ac8
Revert unrelated changes to align_buffers()
felipecrv Feb 15, 2025
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
8 changes: 7 additions & 1 deletion arrow-array/src/ffi_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,13 @@ impl Iterator for ArrowArrayStreamReader {
let result = unsafe {
from_ffi_and_data_type(array, DataType::Struct(self.schema().fields().clone()))
};
Some(result.map(|data| RecordBatch::from(StructArray::from(data))))
Some(result.map(|mut data| {
// Ensure data is aligned (by potentially copying some buffers).
// This is needed because some Arrow C Data Interface sources(e.g.
// ADBC drivers) may produce unaligned buffers.
data.align_buffers();
RecordBatch::from(StructArray::from(data))
}))
} else {
let last_error = self.get_stream_last_error();
let err = ArrowError::CDataInterface(last_error.unwrap());
Expand Down
Loading