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
7 changes: 6 additions & 1 deletion arrow-arith/src/aggregate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,12 @@ mod tests {
Some("c".as_bytes())
);

test_binary!(test_binary_min_max_all_nulls, vec![None, None], None, None);
test_binary!(
test_binary_min_max_all_nulls,
vec![None::<&[u8]>, None],
None,
None
);

test_binary!(
test_binary_min_max_1,
Expand Down
50 changes: 47 additions & 3 deletions arrow-array/src/array/binary_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,29 @@ impl<OffsetSize: OffsetSizeTrait> GenericBinaryArray<OffsetSize> {

impl<OffsetSize: OffsetSizeTrait> From<Vec<Option<&[u8]>>> for GenericBinaryArray<OffsetSize> {
fn from(v: Vec<Option<&[u8]>>) -> Self {
Self::from_opt_vec(v)
v.into_iter().collect()
}
}

impl<OffsetSize: OffsetSizeTrait, const C: usize> From<Vec<Option<[u8; C]>>>
for GenericBinaryArray<OffsetSize>
{
fn from(v: Vec<Option<[u8; C]>>) -> Self {
v.into_iter().collect()
}
}

impl<OffsetSize: OffsetSizeTrait, const C: usize> From<Vec<Option<&[u8; C]>>>
for GenericBinaryArray<OffsetSize>
{
fn from(v: Vec<Option<&[u8; C]>>) -> Self {
v.into_iter().collect()
}
}

impl<OffsetSize: OffsetSizeTrait> From<Vec<Option<Vec<u8>>>> for GenericBinaryArray<OffsetSize> {
fn from(v: Vec<Option<Vec<u8>>>) -> Self {
v.into_iter().collect()
}
}

Expand All @@ -106,6 +128,28 @@ impl<OffsetSize: OffsetSizeTrait> From<Vec<&[u8]>> for GenericBinaryArray<Offset
}
}

impl<OffsetSize: OffsetSizeTrait, const C: usize> From<Vec<[u8; C]>>
for GenericBinaryArray<OffsetSize>
{
fn from(v: Vec<[u8; C]>) -> Self {
Self::from_iter_values(v)
}
}

impl<OffsetSize: OffsetSizeTrait, const C: usize> From<Vec<&[u8; C]>>
for GenericBinaryArray<OffsetSize>
{
fn from(v: Vec<&[u8; C]>) -> Self {
Self::from_iter_values(v)
}
}

impl<OffsetSize: OffsetSizeTrait> From<Vec<Vec<u8>>> for GenericBinaryArray<OffsetSize> {
fn from(v: Vec<Vec<u8>>) -> Self {
Self::from_iter_values(v)
}
}

impl<T: OffsetSizeTrait> From<GenericListArray<T>> for GenericBinaryArray<T> {
fn from(v: GenericListArray<T>) -> Self {
Self::from_list(v)
Expand Down Expand Up @@ -575,7 +619,7 @@ mod tests {

#[test]
fn test_binary_array_all_null() {
let data = vec![None];
let data = vec![None::<&[u8]>];
let array = BinaryArray::from(data);
array
.into_data()
Expand All @@ -585,7 +629,7 @@ mod tests {

#[test]
fn test_large_binary_array_all_null() {
let data = vec![None];
let data = vec![None::<&[u8]>];
let array = LargeBinaryArray::from(data);
array
.into_data()
Expand Down
36 changes: 36 additions & 0 deletions arrow-array/src/array/byte_view_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1140,12 +1140,48 @@ impl From<Vec<&[u8]>> for BinaryViewArray {
}
}

impl<const C: usize> From<Vec<[u8; C]>> for BinaryViewArray {
fn from(v: Vec<[u8; C]>) -> Self {
Self::from_iter_values(v)
}
}

impl<const C: usize> From<Vec<&[u8; C]>> for BinaryViewArray {
fn from(v: Vec<&[u8; C]>) -> Self {
Self::from_iter_values(v)
}
}

impl From<Vec<Vec<u8>>> for BinaryViewArray {
fn from(v: Vec<Vec<u8>>) -> Self {
Self::from_iter_values(v)
}
}

impl From<Vec<Option<&[u8]>>> for BinaryViewArray {
fn from(v: Vec<Option<&[u8]>>) -> Self {
v.into_iter().collect()
}
}

impl<const C: usize> From<Vec<Option<[u8; C]>>> for BinaryViewArray {
fn from(v: Vec<Option<[u8; C]>>) -> Self {
v.into_iter().collect()
}
}

impl<const C: usize> From<Vec<Option<&[u8; C]>>> for BinaryViewArray {
fn from(v: Vec<Option<&[u8; C]>>) -> Self {
v.into_iter().collect()
}
}

impl From<Vec<Option<Vec<u8>>>> for BinaryViewArray {
fn from(v: Vec<Option<Vec<u8>>>) -> Self {
v.into_iter().collect()
}
}

/// A [`GenericByteViewArray`] that stores utf8 data
///
/// See [`GenericByteViewArray`] for format and layout details.
Expand Down
20 changes: 3 additions & 17 deletions arrow-array/src/record_batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ macro_rules! create_array {
(@from TimestampMillisecond) => { $crate::TimestampMillisecondArray };
(@from TimestampMicrosecond) => { $crate::TimestampMicrosecondArray };
(@from TimestampNanosecond) => { $crate::TimestampNanosecondArray };

(@from Binary) => { $crate::BinaryArray };
(@from BinaryView) => { $crate::BinaryViewArray };
(@from LargeBinary) => { $crate::LargeBinaryArray };
(@from $ty: ident) => {
compile_error!(concat!("Unsupported data type: ", stringify!($ty)))
};
Expand All @@ -124,26 +126,10 @@ macro_rules! create_array {
std::sync::Arc::new($crate::NullArray::new($size))
};

(Binary, [$($values: expr),*]) => {
std::sync::Arc::new($crate::BinaryArray::from_vec(vec![$($values),*]))
};

(LargeBinary, [$($values: expr),*]) => {
std::sync::Arc::new($crate::LargeBinaryArray::from_vec(vec![$($values),*]))
};

($ty: tt, [$($values: expr),*]) => {
std::sync::Arc::new(<$crate::create_array!(@from $ty)>::from(vec![$($values),*]))
};

(Binary, $values: expr) => {
std::sync::Arc::new($crate::BinaryArray::from_vec($values))
};

(LargeBinary, $values: expr) => {
std::sync::Arc::new($crate::LargeBinaryArray::from_vec($values))
};

($ty: tt, $values: expr) => {
std::sync::Arc::new(<$crate::create_array!(@from $ty)>::from($values))
};
Expand Down
Loading