Skip to content
Merged
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
41 changes: 27 additions & 14 deletions arrow-array/src/array/run_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use std::any::Any;
use std::sync::Arc;

use arrow_buffer::{ArrowNativeType, BooleanBufferBuilder, NullBuffer, RunEndBuffer};
use arrow_buffer::{ArrowNativeType, BooleanBufferBuilder, NullBuffer, RunEndBuffer, ScalarBuffer};
use arrow_data::{ArrayData, ArrayDataBuilder};
use arrow_schema::{ArrowError, DataType, Field};

Expand Down Expand Up @@ -223,27 +223,40 @@ impl<R: RunEndIndexType> RunArray<R> {
impl<R: RunEndIndexType> From<ArrayData> for RunArray<R> {
// The method assumes the caller already validated the data using `ArrayData::validate_data()`
fn from(data: ArrayData) -> Self {
match data.data_type() {
let (data_type, len, _nulls, offset, _buffers, child_data) = data.into_parts();

match &data_type {
DataType::RunEndEncoded(_, _) => {}
_ => {
panic!(
"Invalid data type for RunArray. The data type should be DataType::RunEndEncoded"
"Invalid data type {data_type:?} for RunArray. Should be DataType::RunEndEncoded"
);
}
}

// Safety
// ArrayData is valid
let child = &data.child_data()[0];
assert_eq!(child.data_type(), &R::DATA_TYPE, "Incorrect run ends type");
let run_ends = unsafe {
let scalar = child.buffers()[0].clone().into();
RunEndBuffer::new_unchecked(scalar, data.offset(), data.len())
};

let values = make_array(data.child_data()[1].clone());
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is real clone of ArrayData , which allocates a Vec, which is no longer done by this PR

let [run_end_child, values_child]: [ArrayData; 2] = child_data
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a nice way to check the length and destructure the ArrayData in one command

https://stackoverflow.com/questions/29570607/is-there-a-good-way-to-convert-a-vect-to-an-array

.try_into()
.expect("RunArray data should have exactly two child arrays");

// deconstruct the run ends child array
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is what the current code does too (reaches into the child array data and gets the first buffer)

The current code also checks that there is exactly 1 buffer in the child array

let (
run_end_data_type,
_run_end_len,
_run_end_nulls,
_run_end_offset,
run_end_buffers,
_run_end_child_data,
) = run_end_child.into_parts();
assert_eq!(run_end_data_type, R::DATA_TYPE, "Incorrect run ends type");
let [run_end_buffer]: [arrow_buffer::Buffer; 1] = run_end_buffers
.try_into()
.expect("Run ends should have exactly one buffer");
let scalar = ScalarBuffer::from(run_end_buffer);
let run_ends = unsafe { RunEndBuffer::new_unchecked(scalar, offset, len) };
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note the previous code also uses unsafe to create a RunEndBuffer (which is valid during construction of ArrayData)


let values = make_array(values_child);
Self {
data_type: data.data_type().clone(),
data_type,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also avoids a DataType::drop which is not likely to make a large difference but is still something

run_ends,
values,
}
Expand Down
Loading