connortsui20 commented on code in PR #8624:
URL: https://github.com/apache/arrow-rs/pull/8624#discussion_r2487964530
##########
arrow-array/src/array/fixed_size_list_array.rs:
##########
@@ -152,22 +168,88 @@ impl FixedSizeListArray {
ArrowError::InvalidArgumentError(format!("Size cannot be negative,
got {size}"))
})?;
- let len = match s {
- 0 => nulls.as_ref().map(|x| x.len()).unwrap_or_default(),
- _ => {
- let len = values.len() / s.max(1);
- if let Some(n) = nulls.as_ref() {
- if n.len() != len {
- return Err(ArrowError::InvalidArgumentError(format!(
- "Incorrect length of null buffer for
FixedSizeListArray, expected {} got {}",
- len,
- n.len(),
- )));
- }
+ if s == 0 {
+ // Note that for degenerate (`size == 0`) and non-nullable
`FixedSizeList`s, we will set
+ // the length to 0 (`_or_default`).
+ let len = nulls.as_ref().map(|x| x.len()).unwrap_or_default();
+
+ Self::try_new_with_length(field, size, values, nulls, len)
+ } else {
+ if values.len() % s != 0 {
+ return Err(ArrowError::InvalidArgumentError(format!(
+ "Incorrect length of values buffer for FixedSizeListArray,
\
+ expected a multiple of {s} got {}",
+ values.len(),
+ )));
+ }
+
+ let len = values.len() / s;
+
+ // Check that the null buffer length is correct (if it exists).
+ if let Some(null_buffer) = &nulls {
+ if s * null_buffer.len() != values.len() {
+ return Err(ArrowError::InvalidArgumentError(format!(
+ "Incorrect length of values buffer for
FixedSizeListArray, \
+ expected {} got {}",
+ s * null_buffer.len(),
+ values.len(),
+ )));
}
- len
}
- };
+
+ Self::try_new_with_length(field, size, values, nulls, len)
+ }
+ }
+
+ /// Create a new [`FixedSizeListArray`] from the provided parts, returning
an error on failure.
+ ///
+ /// This method exists to allow the construction of arbitrary length
degenerate (`size == 0`)
+ /// and non-nullable `FixedSizeListArray`s. If you want a nullable
`FixedSizeListArray`, then
+ /// you can use [`try_new()`] instead.
+ ///
+ /// [`try_new()`]: Self::try_new
+ ///
+ /// # Errors
+ ///
+ /// * `size < 0`
+ /// * `nulls.len() != len` if `nulls` is `Some`
+ /// * `values.len() != len * size`
+ /// * `values.data_type() != field.data_type()`
+ /// * `!field.is_nullable() &&
!nulls.expand(size).contains(values.logical_nulls())`
+ pub fn try_new_with_length(
+ field: FieldRef,
+ size: i32,
+ values: ArrayRef,
+ nulls: Option<NullBuffer>,
+ len: usize,
+ ) -> Result<Self, ArrowError> {
+ let s = size.to_usize().ok_or_else(|| {
+ ArrowError::InvalidArgumentError(format!("Size cannot be negative,
got {size}"))
+ })?;
+
+ if let Some(null_buffer) = &nulls
+ && null_buffer.len() != len
Review Comment:
Oh this is the issue
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
