Skip to content
Merged
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
14 changes: 6 additions & 8 deletions arrow-row/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1644,24 +1644,22 @@ fn encode_column(
}
}
DataType::Binary => {
variable::encode(data, offsets, as_generic_binary_array::<i32>(column).iter(), opts)
variable::encode_generic_byte_array(data, offsets, as_generic_binary_array::<i32>(column), opts)
}
DataType::BinaryView => {
variable::encode(data, offsets, column.as_binary_view().iter(), opts)
}
DataType::LargeBinary => {
variable::encode(data, offsets, as_generic_binary_array::<i64>(column).iter(), opts)
variable::encode_generic_byte_array(data, offsets, as_generic_binary_array::<i64>(column), opts)
}
DataType::Utf8 => variable::encode(
DataType::Utf8 => variable::encode_generic_byte_array(
data, offsets,
column.as_string::<i32>().iter().map(|x| x.map(|x| x.as_bytes())),
column.as_string::<i32>(),
opts,
),
DataType::LargeUtf8 => variable::encode(
DataType::LargeUtf8 => variable::encode_generic_byte_array(
data, offsets,
column.as_string::<i64>()
.iter()
.map(|x| x.map(|x| x.as_bytes())),
column.as_string::<i64>(),
opts,
),
DataType::Utf8View => variable::encode(
Expand Down
46 changes: 45 additions & 1 deletion arrow-row/src/variable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@

use crate::null_sentinel;
use arrow_array::builder::BufferBuilder;
use arrow_array::types::ByteArrayType;
use arrow_array::*;
use arrow_buffer::MutableBuffer;
use arrow_buffer::bit_util::ceil;
use arrow_buffer::{ArrowNativeType, MutableBuffer};
use arrow_data::{ArrayDataBuilder, MAX_INLINE_VIEW_LEN};
use arrow_schema::{DataType, SortOptions};
use builder::make_view;
Expand Down Expand Up @@ -84,6 +85,48 @@ pub fn encode<'a, I: Iterator<Item = Option<&'a [u8]>>>(
}
}

/// Calls [`encode`] with optimized iterator for generic byte arrays
pub(crate) fn encode_generic_byte_array<T: ByteArrayType>(
data: &mut [u8],
offsets: &mut [usize],
input_array: &GenericByteArray<T>,
opts: SortOptions,
) {
let input_offsets = input_array.value_offsets();
let bytes = input_array.values().as_slice();

if let Some(null_buffer) = input_array.nulls().filter(|x| x.null_count() > 0) {
let input_iter =
input_offsets
.windows(2)
.zip(null_buffer.iter())
.map(|(start_end, is_valid)| {
if is_valid {
let item_range = start_end[0].as_usize()..start_end[1].as_usize();
// SAFETY: the offsets of the input are valid by construction
// so it is ok to use unsafe here
let item = unsafe { bytes.get_unchecked(item_range) };
Some(item)
} else {
None
}
});

encode(data, offsets, input_iter, opts);
} else {
// Skip null checks
let input_iter = input_offsets.windows(2).map(|start_end| {
let item_range = start_end[0].as_usize()..start_end[1].as_usize();
// SAFETY: the offsets of the input are valid by construction
// so it is ok to use unsafe here
let item = unsafe { bytes.get_unchecked(item_range) };
Some(item)
});

encode(data, offsets, input_iter, opts);
}
}

pub fn encode_null(out: &mut [u8], opts: SortOptions) -> usize {
out[0] = null_sentinel(opts);
1
Expand All @@ -97,6 +140,7 @@ pub fn encode_empty(out: &mut [u8], opts: SortOptions) -> usize {
1
}

#[inline]
pub fn encode_one(out: &mut [u8], val: Option<&[u8]>, opts: SortOptions) -> usize {
match val {
None => encode_null(out, opts),
Expand Down
Loading