Implement Arrow PyCapsule Interface #5070
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,6 +55,7 @@ | |
| //! [pyarrow.Table.to_reader()](https://arrow.apache.org/docs/python/generated/pyarrow.Table.html#pyarrow.Table.to_reader) | ||
| //! and then importing the reader as a [ArrowArrayStreamReader]. | ||
|
|
||
| use std::borrow::BorrowMut; | ||
| use std::convert::{From, TryFrom}; | ||
| use std::ptr::{addr_of, addr_of_mut}; | ||
| use std::sync::Arc; | ||
|
|
@@ -262,9 +263,10 @@ impl FromPyArrow for ArrayData { | |
| validate_pycapsule(array_capsule, "arrow_array")?; | ||
|
|
||
| let schema_ptr = unsafe { schema_capsule.reference::<FFI_ArrowSchema>() }; | ||
| let array_ptr = array_capsule.pointer() as *mut FFI_ArrowArray; | ||
| let array_mut = unsafe { array_ptr.as_mut() }; | ||
|
There was a problem hiding this comment. FWIW you could use https://doc.rust-lang.org/std/ptr/fn.replace.html as we're already playing with pointers here There was a problem hiding this comment. Updated in e7ed58d; is that what you meant? |
||
|
|
||
| let array = std::mem::replace(array_mut.unwrap(), FFI_ArrowArray::empty()); | ||
| return ffi::from_ffi(array, schema_ptr).map_err(to_py_err); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Potential refactor for later, but it would be nice to move the Capsule imports to their own functions that aren't named as if to by PyArrow-specific. Right now this module is named for PyArrow, but the import logic will apply to other Arrow implementations as well.