Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions arrow-data/src/transform/list_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ pub(super) fn build_extend<T: ArrowNativeType + Integer + CheckedAdd>(
let offsets = array.buffer::<T>(0);
let sizes = array.buffer::<T>(1);
Box::new(
move |mutable: &mut _MutableArrayData, _index: usize, start: usize, len: usize| {
let offset_buffer = &mut mutable.buffer1;
let sizes_buffer = &mut mutable.buffer2;
move |mutable: &mut _MutableArrayData, index: usize, start: usize, len: usize| {
let mut new_offset = mutable.child_data[0].len();

for &offset in &offsets[start..start + len] {
offset_buffer.push(offset);
}
for i in start..start + len {
let size = sizes[i].as_usize();

// sizes
for &size in &sizes[start..start + len] {
sizes_buffer.push(size);
}
mutable.buffer1.push(T::usize_as(new_offset));
mutable.buffer2.push(sizes[i]);
new_offset += size;

// the beauty of views is that we don't need to copy child_data, we just splat
// the offsets and sizes.
if size > 0 {
let child_start = offsets[i].as_usize();
mutable.child_data[0].extend(index, child_start, child_start + size);
}
}
},
)
}
Expand Down
55 changes: 55 additions & 0 deletions arrow-select/src/interleave.rs
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ mod tests {
use arrow_array::Int32RunArray;
use arrow_array::builder::{GenericListBuilder, Int32Builder, PrimitiveRunBuilder};
use arrow_array::types::Int8Type;
use arrow_buffer::ScalarBuffer;
use arrow_schema::Field;

#[test]
Expand Down Expand Up @@ -1489,4 +1490,58 @@ mod tests {
Err(ArrowError::OffsetOverflowError(_))
));
}

#[test]
fn test_interleave_list_view() {
// `interleave` for ListView falls through to `interleave_fallback`, which uses
// `MutableArrayData`. `list_view::build_extend` copies offsets/sizes but never
// extends the child array, so the result contains offsets/sizes that reference
// positions in the now-absent original child arrays while the child is empty.
//
// lv_a: [[1, 2], [3]] (values=[1,2,3], offsets=[0,2], sizes=[2,1])
// lv_b: [[4, 5, 6]] (values=[4,5,6], offsets=[0], sizes=[3])
// interleave at [(0,0), (1,0), (0,1)] should produce [[1, 2], [4, 5, 6], [3]]
let field = Arc::new(Field::new_list_field(DataType::Int64, false));

let lv_a = ListViewArray::new(
Arc::clone(&field),
ScalarBuffer::from(vec![0i32, 2]),
ScalarBuffer::from(vec![2i32, 1]),
Arc::new(Int64Array::from(vec![1_i64, 2, 3])),
None,
);
let lv_b = ListViewArray::new(
field,
ScalarBuffer::from(vec![0i32]),
ScalarBuffer::from(vec![3i32]),
Arc::new(Int64Array::from(vec![4_i64, 5, 6])),
None,
);

let result = interleave(
&[&lv_a as &dyn Array, &lv_b as &dyn Array],
&[(0, 0), (1, 0), (0, 1)],
)
.unwrap();

result
.to_data()
.validate_full()
.expect("interleaved ListViewArray must be internally consistent");

let result_lv = result.as_list_view::<i32>();
assert_eq!(result_lv.len(), 3);
assert_eq!(
result_lv.value(0).as_primitive::<Int64Type>().values(),
&[1, 2]
);
assert_eq!(
result_lv.value(1).as_primitive::<Int64Type>().values(),
&[4, 5, 6]
);
assert_eq!(
result_lv.value(2).as_primitive::<Int64Type>().values(),
&[3]
);
}
}
Loading