[ffi] Fix arrow-array null_count error during conversion from C to Rust #6674
Conversation
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
tustvold
reviewed
Nov 4, 2024
tustvold
reviewed
Nov 4, 2024
arrow-data/src/ffi.rs
Outdated
Comment on lines
272
to
276
| if self.null_count >= 0 { | ||
| Some(self.null_count as usize) | ||
| } else { | ||
| None | ||
| } |
There was a problem hiding this comment.
Suggested change
| if self.null_count >= 0 { | |
| Some(self.null_count as usize) | |
| } else { | |
| None | |
| } | |
| self.null_count.try_into().ok()? |
Perhaps, or using bool::then_some if you wish to be more explicit
arrow-array/src/ffi.rs
Outdated
| ffi_array.set_null_count(-1); | ||
| assert_eq!(None, ffi_array.null_count()); | ||
| let null_data = unsafe { from_ffi_and_data_type(ffi_array, DataType::Null) }.unwrap(); | ||
| assert_eq!(10, null_data.null_count()); |
There was a problem hiding this comment.
Suggested change
| assert_eq!(10, null_data.null_count()); | |
| assert_eq!(0, null_data.null_count()); |
The null count for a NullArray should be 0, I know it is weird...
arrow-data/src/ffi.rs
Outdated
| @@ -267,8 +267,19 @@ impl FFI_ArrowArray { | |||
|
|
|||
| /// the null count of the array | |||
| #[inline] | |||
| pub fn null_count(&self) -> usize { | |||
| self.null_count as usize | |||
| pub fn null_count(&self) -> Option<usize> { | |||
There was a problem hiding this comment.
Unfortunately as written this is a breaking change, perhaps we could add a null_count_checked or something to avoid this?
|
Hi, @tustvold , Thanks for your review. I follow your suggestion and updated the PR, please review it again, thanks. |
tustvold
reviewed
Nov 5, 2024
tustvold
approved these changes
Nov 5, 2024
tustvold
reviewed
Nov 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Which issue does this PR close?
Closes #6497
Rationale for this change
What changes are included in this PR?
Option<usize>, and return None if the value of null_count < 0.Option<usize>, ArrayData will initialize if value is None.Are there any user-facing changes?
No