-
Notifications
You must be signed in to change notification settings - Fork 867
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.
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
fix: first none/empty list in ListArray
panics in cast_with_options
#7065
Conversation
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.
Some initial thoughts. I'm still going through the cast code to try understand what exactly is happening here and why the fix works the way it does.
arrow-cast/src/cast/list.rs
Outdated
let values = if last_pos == 0 && !null_first { | ||
array.values().slice(0, cap) // All slices were the correct length | ||
} else { | ||
if mutable.len() != cap { | ||
// Remaining slices were all correct length | ||
let remaining = cap - mutable.len(); | ||
mutable.extend(0, last_pos, last_pos + remaining) | ||
} | ||
make_array(mutable.freeze()) | ||
}; |
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.
let values = if last_pos == 0 && !null_first { | |
array.values().slice(0, cap) // All slices were the correct length | |
} else { | |
if mutable.len() != cap { | |
// Remaining slices were all correct length | |
let remaining = cap - mutable.len(); | |
mutable.extend(0, last_pos, last_pos + remaining) | |
} | |
make_array(mutable.freeze()) | |
}; | |
let values = match last_pos { | |
0 if !null_first => array.values().slice(0, cap), // All slices were the correct length | |
_ => { | |
if mutable.len() != cap { | |
// Remaining slices were all correct length | |
let remaining = cap - mutable.len(); | |
mutable.extend(0, last_pos, last_pos + remaining) | |
} | |
make_array(mutable.freeze()) | |
} | |
}; |
nit: using guard in the match arm would reduce the diff happening here
arrow-cast/src/cast/list.rs
Outdated
@@ -88,11 +88,16 @@ where | |||
let mut mutable = MutableArrayData::new(vec![&values], nullable, cap); | |||
// The end position in values of the last incorrectly-sized list slice | |||
let mut last_pos = 0; | |||
let mut null_first = false; |
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.
I don't believe it's about nulls being first, rather about a potentially empty list being first. Consider this test case which also panics during cast:
#[test]
fn test456() {
let array = Arc::new(ListArray::from_iter_primitive::<Int64Type, _, _>(vec![
Some(vec![]),
Some(vec![Some(1), Some(2)]),
])) as ArrayRef;
let data_type =
DataType::FixedSizeList(FieldRef::new(Field::new("item", DataType::Int64, true)), 2);
let opt = CastOptions::default();
let r = cast_with_options(&array, &data_type, &opt).unwrap();
let fixed_array = Arc::new(FixedSizeListArray::from_iter_primitive::<Int64Type, _, _>(
vec![None, Some(vec![Some(1), Some(2)])],
2,
)) as ArrayRef;
assert_eq!(*fixed_array, *r);
}
This distinction is important as nullability isn't determined by the gap between offsets, rather it's determined by the null buffer.
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.
Thanks @Jefffrey for your review, in my local testing, null_first
can identify both None and empty vec (the name null_first
might be a bit misleading). My idea is to use null_first
to prevent entering the let values = match last_pos { 0 => }
situation.
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.
I think I understand what's happening now. It seems its an edge case of the algorithm used here, where a 0 sized list element precedes a list of the proper size, e.g.
Cast to fixed sized 2:
[
[],
[],
[1, 2],
]
Where last_pos
is never updated from 0 because end_pos
for the first two elements is 0
and last_pos
doesn't get updated when the list element already matches the fixed size to cast to.
(Sorry if this was already obvious, just needed to air my thoughts out)
Whilst this fix is correct, I'd like some more documentation, and especially rename null_first
to something more accurate (as the problem is with empty size lists too), to explain this edge case so it's obvious to anyone else modifying the code here in the future.
We could also look into moving the:
if start_pos == 0 && end_pos == 0 {
Check outside of the for loop as we only need to check it once upfront.
Thanks @Jefffrey , I've made the requested changes. Could you help review it again? |
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.
One minor nit, other than that looks good; thanks 👍
ListArray
panics in cast_with_options
ListArray
panics in cast_with_options
Co-authored-by: Jeffrey Vo <[email protected]>
…s` (apache#7065) * fix: first none in `ListArray` panics in `cast_with_options` * simplify * fix * Update arrow-cast/src/cast/list.rs Co-authored-by: Jeffrey Vo <[email protected]> --------- Co-authored-by: Jeffrey Vo <[email protected]>
…e32 (#7074) * Support converting large dates (i.e. +10999-12-31) from string to Date32 * Fix lint * Update arrow-cast/src/parse.rs Co-authored-by: Andrew Lamb <[email protected]> * fix: issue introduced in #6833 - less than equal check for scale in decimal conversion (#7070) * fix <= check for scale in decimal conversion * Update arrow-cast/src/cast/mod.rs name change Co-authored-by: Arttu <[email protected]> * remove incorrect comment --------- Co-authored-by: Arttu <[email protected]> * minor: re-export `OffsetBufferBuilder` in `arrow` crate (#7077) * Add another decimal cast edge test case (#7078) * Add another decimal cast edge test case Before 1019f5b this test would fail, as the cast produced 1. 0 is an edge case worth explicitly testing for. * typo/fmt Co-authored-by: Felipe Oliveira Carvalho <[email protected]> --------- Co-authored-by: Felipe Oliveira Carvalho <[email protected]> * Support both 0x01 and 0x02 as type for list of booleans in thrift metadata (#7052) * Support both 0x01 and 0x02 as type for list of booleans * Also support 0 for false inside boolean collections * Use hex notation in tests * Fix LocalFileSystem with range request that ends beyond end of file (#6751) * Fix LocalFileSystem with range request that ends beyond end of file * fix windows * add comment * Seek error * fix seek check * remove windows flag * Get file length from file metadata * Introduce `UnsafeFlag` to manage disabling `ArrayData` validation (#7027) * Introduce UnsafeFlag to manage disabling validation * fix docs * Refactor arrow-ipc: Rename `ArrayReader` to `RecodeBatchDecoder` (#7028) * Rename `ArrayReader` to `RecordBatchDecoder` * Remove alias for `self` * Minor: Update release schedule (#7086) * Minor: Update release schedule * realism * Refactor some decimal-related code and tests (#7062) * Refactor some decimal-related code and tests in preparation for adding Decimal32 and Decimal64 support * Fixed symbol * Apply PR feedback * Fixed format problem * Fixed logical merge conflicts * PR feedback * Refactor arrow-ipc: Move `create_*_array` methods into `RecordBatchDecoder` (#7029) * Move `create_primitive_array` into RecordBatchReader * Move `create_list-array` into RecordBatchReader * Move `create_dictionay_array` into RecordBatchReader * Print Parquet BasicTypeInfo id when present (#7094) * Print Parquet BasicTypeInfo id when present * Improve print_schema documentation * tiny cleanup * Add a custom implementation `LocalFileSystem::list_with_offset` (#7019) * Initial change from Daniel. * Upgrade unit test to be more generic. * Add comments on why we have filter * Cleanup unit tests. * Update object_store/src/local.rs Co-authored-by: Adam Reeve <[email protected]> * Add changes suggested by Adam. * Cleanup match error. * Apply formatting changes suggested by cargo +stable fmt --all. * Apply cosmetic changes suggested by clippy. * Upgrade test_path_with_offset to create temporary directory + files for testing rather than pointing to existing dir. --------- Co-authored-by: Adam Reeve <[email protected]> * fix: first none/empty list in `ListArray` panics in `cast_with_options` (#7065) * fix: first none in `ListArray` panics in `cast_with_options` * simplify * fix * Update arrow-cast/src/cast/list.rs Co-authored-by: Jeffrey Vo <[email protected]> --------- Co-authored-by: Jeffrey Vo <[email protected]> * Benchmarks for Arrow IPC writer (#7090) * Add benchmarks for Arrow IPC writer * Add benchmarks for Arrow IPC writer * reuse target buffer * rename, etc * Add compression type * update --------- Co-authored-by: Andy Grove <[email protected]> * Minor: Clarify documentation on `NullBufferBuilder::allocated_size` (#7089) * Minor: Clarify documentaiton on NullBufferBuilder::allocated_size * add note about why allocations are 64 bytes * Add more tests for edge cases * Add negative test case for incorrectly formatted large dates --------- Co-authored-by: Andrew Lamb <[email protected]> Co-authored-by: Himadri Pal <[email protected]> Co-authored-by: Arttu <[email protected]> Co-authored-by: Piotr Findeisen <[email protected]> Co-authored-by: Felipe Oliveira Carvalho <[email protected]> Co-authored-by: Jörn Horstmann <[email protected]> Co-authored-by: Kyle Barron <[email protected]> Co-authored-by: Curt Hagenlocher <[email protected]> Co-authored-by: Devin Smith <[email protected]> Co-authored-by: Corwin Joy <[email protected]> Co-authored-by: Adam Reeve <[email protected]> Co-authored-by: irenjj <[email protected]> Co-authored-by: Jeffrey Vo <[email protected]> Co-authored-by: Andy Grove <[email protected]>
Which issue does this PR close?
cast_with_options
#7043Rationale for this change
What changes are included in this PR?
Are there any user-facing changes?