This repository has been archived by the owner on Aug 13, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support convert arrow value and type to AnyValue, Any (#141)
Co-authored-by: ZENOTME <[email protected]>
- Loading branch information
Showing
9 changed files
with
704 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pub mod to_array; | ||
pub(crate) mod to_primitive; | ||
pub mod types; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,359 @@ | ||
use super::to_primitive::ToPrimitiveValue; | ||
use crate::types::PrimitiveValue; | ||
use crate::types::{Any, AnyValue, StructValueBuilder}; | ||
use crate::Result; | ||
use arrow::array::{ | ||
Array, Date32Array, Date64Array, Float32Array, Float64Array, Int16Array, Int32Array, | ||
Int64Array, Int8Array, UInt16Array, UInt32Array, UInt64Array, UInt8Array, | ||
}; | ||
use arrow::{ | ||
array::{BooleanArray, PrimitiveArray, StructArray}, | ||
datatypes::ArrowPrimitiveType, | ||
}; | ||
use std::iter::Iterator; | ||
pub trait ToArray { | ||
fn to_anyvalue_array(&self) -> Result<Vec<Option<AnyValue>>>; | ||
} | ||
|
||
impl ToArray for BooleanArray { | ||
fn to_anyvalue_array(&self) -> Result<Vec<Option<AnyValue>>> { | ||
Ok(self | ||
.iter() | ||
.map(|x| x.map(|x| AnyValue::Primitive(PrimitiveValue::Boolean(x)))) | ||
.collect()) | ||
} | ||
} | ||
|
||
impl<T: ArrowPrimitiveType> ToArray for PrimitiveArray<T> | ||
where | ||
T::Native: ToPrimitiveValue, | ||
{ | ||
fn to_anyvalue_array(&self) -> Result<Vec<Option<AnyValue>>> { | ||
self.into_iter() | ||
.map(|x| { | ||
if let Some(x) = x { | ||
Ok(Some(AnyValue::Primitive(x.to_primitive(T::DATA_TYPE)?))) | ||
} else { | ||
Ok(None) | ||
} | ||
}) | ||
.collect::<Result<_>>() | ||
} | ||
} | ||
|
||
/// We use the custom function to convert struct array to anyvalue array instead of using | ||
/// `ToArray` beacsue we need to pre-compute the target type of the struct array. This can | ||
/// save convert time and the memory cost in some case. | ||
fn struct_to_anyvalue_array_with_type( | ||
array: &StructArray, | ||
target_type: Any, | ||
) -> Result<Vec<Option<AnyValue>>> { | ||
let row_num = array.len(); | ||
if let Any::Struct(target_struct) = target_type { | ||
let arrays = array.columns(); | ||
|
||
let mut arrays = arrays | ||
.iter() | ||
.zip(target_struct.fields().iter()) | ||
.map(|(array, target_field)| { | ||
Ok( | ||
to_anyvalue_array_with_type(&array, target_field.field_type.clone())? | ||
.into_iter(), | ||
) | ||
}) | ||
.collect::<Result<Vec<_>>>()?; | ||
|
||
let mut null_iter = array.nulls().map(|null_buf| null_buf.into_iter()); | ||
let mut res = Vec::with_capacity(row_num); | ||
for _ in 0..row_num { | ||
if let Some(null_iter) = null_iter.as_mut() { | ||
// return false if the value is null | ||
if !null_iter.next().unwrap() { | ||
res.push(None); | ||
continue; | ||
} | ||
} | ||
let mut builder = StructValueBuilder::new(target_struct.clone()); | ||
for (field, array_iter) in target_struct.fields().iter().zip(arrays.iter_mut()) { | ||
builder.add_field(field.id, array_iter.next().unwrap())?; | ||
} | ||
res.push(Some(builder.build()?.into())); | ||
} | ||
Ok(res) | ||
} else { | ||
unreachable!() | ||
} | ||
} | ||
|
||
/// Convert an arrow array to an anyvalue array. | ||
pub fn to_anyvalue_array_with_type( | ||
array: &dyn Array, | ||
target_type: Any, | ||
) -> Result<Vec<Option<AnyValue>>> { | ||
let data_type = array.data_type(); | ||
match *data_type { | ||
arrow::datatypes::DataType::Boolean => array | ||
.as_any() | ||
.downcast_ref::<BooleanArray>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Struct(_) => { | ||
let array = array.as_any().downcast_ref::<StructArray>().unwrap(); | ||
struct_to_anyvalue_array_with_type(array, target_type) | ||
} | ||
arrow::datatypes::DataType::Int8 => array | ||
.as_any() | ||
.downcast_ref::<Int8Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Int16 => array | ||
.as_any() | ||
.downcast_ref::<Int16Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Int32 => array | ||
.as_any() | ||
.downcast_ref::<Int32Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Int64 => array | ||
.as_any() | ||
.downcast_ref::<Int64Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::UInt8 => array | ||
.as_any() | ||
.downcast_ref::<UInt8Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::UInt16 => array | ||
.as_any() | ||
.downcast_ref::<UInt16Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::UInt32 => array | ||
.as_any() | ||
.downcast_ref::<UInt32Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::UInt64 => array | ||
.as_any() | ||
.downcast_ref::<UInt64Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Float32 => array | ||
.as_any() | ||
.downcast_ref::<Float32Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Float64 => array | ||
.as_any() | ||
.downcast_ref::<Float64Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Date32 => array | ||
.as_any() | ||
.downcast_ref::<Date32Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Date64 => array | ||
.as_any() | ||
.downcast_ref::<Date64Array>() | ||
.unwrap() | ||
.to_anyvalue_array(), | ||
arrow::datatypes::DataType::Float16 => todo!(), | ||
arrow::datatypes::DataType::Null => todo!(), | ||
arrow::datatypes::DataType::Timestamp(_, _) => todo!(), | ||
arrow::datatypes::DataType::Time32(_) => todo!(), | ||
arrow::datatypes::DataType::Time64(_) => todo!(), | ||
arrow::datatypes::DataType::Duration(_) => todo!(), | ||
arrow::datatypes::DataType::Interval(_) => todo!(), | ||
arrow::datatypes::DataType::FixedSizeBinary(_) => todo!(), | ||
arrow::datatypes::DataType::List(_) => todo!(), | ||
arrow::datatypes::DataType::FixedSizeList(_, _) => todo!(), | ||
arrow::datatypes::DataType::LargeList(_) => todo!(), | ||
arrow::datatypes::DataType::Union(_, _) => todo!(), | ||
arrow::datatypes::DataType::Dictionary(_, _) => todo!(), | ||
arrow::datatypes::DataType::Decimal128(_, _) => todo!(), | ||
arrow::datatypes::DataType::Decimal256(_, _) => todo!(), | ||
arrow::datatypes::DataType::Map(_, _) => todo!(), | ||
arrow::datatypes::DataType::RunEndEncoded(_, _) => todo!(), | ||
arrow::datatypes::DataType::Binary => todo!(), | ||
arrow::datatypes::DataType::LargeBinary => todo!(), | ||
arrow::datatypes::DataType::Utf8 => todo!(), | ||
arrow::datatypes::DataType::LargeUtf8 => todo!(), | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
use crate::types::Field; | ||
use crate::types::Primitive; | ||
use crate::types::Struct; | ||
use crate::types::{arrow::from_arrow::to_array::ToArray, AnyValue, PrimitiveValue}; | ||
use arrow::datatypes::DataType as ArrowDataType; | ||
use arrow::datatypes::Field as ArrowField; | ||
use arrow::datatypes::Fields as ArrowFields; | ||
use std::sync::Arc; | ||
#[test] | ||
fn test_from_bool_array() { | ||
let array = arrow::array::BooleanArray::from(vec![Some(true), None, Some(false)]); | ||
let expect: Vec<Option<AnyValue>> = vec![ | ||
Some(PrimitiveValue::Boolean(true).into()), | ||
None, | ||
Some(PrimitiveValue::Boolean(false).into()), | ||
]; | ||
assert_eq!(array.to_anyvalue_array().unwrap(), expect); | ||
} | ||
|
||
#[test] | ||
fn test_from_primitive_array() { | ||
let array = arrow::array::Int32Array::from(vec![Some(1), None, Some(3)]); | ||
let expect: Vec<Option<AnyValue>> = vec![ | ||
Some(PrimitiveValue::Int(1).into()), | ||
None, | ||
Some(PrimitiveValue::Int(3).into()), | ||
]; | ||
assert_eq!(array.to_anyvalue_array().unwrap(), expect); | ||
} | ||
|
||
#[test] | ||
fn test_from_simple_struct_array() { | ||
// construct a arrow struct array | ||
let fields: ArrowFields = vec![ | ||
Arc::new(ArrowField::new("b", ArrowDataType::Boolean, false)), | ||
Arc::new(ArrowField::new("c", ArrowDataType::Int32, false)), | ||
] | ||
.into(); | ||
let boolean = Arc::new(BooleanArray::from(vec![false, true, true])); | ||
let int = Arc::new(Int32Array::from(vec![42, 28, 28])); | ||
let struct_array = StructArray::new( | ||
fields.clone(), | ||
vec![boolean, int], | ||
Some(vec![true, false, true].into()), | ||
); | ||
|
||
// construct a anyvalue struct array | ||
let struct_ty = Arc::new(Struct::new(vec![ | ||
Field::required(0, "b", Primitive::Boolean.into()), | ||
Field::required(1, "c", Primitive::Int.into()), | ||
])); | ||
let mut expect: Vec<Option<AnyValue>> = Vec::with_capacity(4); | ||
let mut struct_builder = StructValueBuilder::new(struct_ty.clone()); | ||
struct_builder | ||
.add_field(0, Some(PrimitiveValue::Boolean(false).into())) | ||
.unwrap(); | ||
struct_builder | ||
.add_field(1, Some(PrimitiveValue::Int(42).into())) | ||
.unwrap(); | ||
expect.push(Some(struct_builder.build().unwrap().into())); | ||
expect.push(None); | ||
let mut struct_builder = StructValueBuilder::new(struct_ty); | ||
struct_builder | ||
.add_field(0, Some(PrimitiveValue::Boolean(true).into())) | ||
.unwrap(); | ||
struct_builder | ||
.add_field(1, Some(PrimitiveValue::Int(28).into())) | ||
.unwrap(); | ||
expect.push(Some(struct_builder.build().unwrap().into())); | ||
|
||
let struct_ty: Any = ArrowDataType::Struct(fields).try_into().unwrap(); | ||
assert_eq!( | ||
struct_to_anyvalue_array_with_type(&struct_array, struct_ty).unwrap(), | ||
expect | ||
); | ||
} | ||
|
||
#[test] | ||
fn test_from_nested_struct_array() { | ||
// this test test a struct with type like | ||
// struct { | ||
// struct { | ||
// bool, | ||
// int | ||
// } | ||
// struct { | ||
// bool, | ||
// int | ||
// } | ||
// } | ||
// construct a arrow struct array. | ||
let sub_fields: ArrowFields = vec![ | ||
Arc::new(ArrowField::new("c", ArrowDataType::Boolean, false)), | ||
Arc::new(ArrowField::new("d", ArrowDataType::Int32, false)), | ||
] | ||
.into(); | ||
let fields: ArrowFields = vec![ | ||
Arc::new(ArrowField::new( | ||
"a", | ||
ArrowDataType::Struct(sub_fields.clone()), | ||
false, | ||
)), | ||
Arc::new(ArrowField::new( | ||
"b", | ||
ArrowDataType::Struct(sub_fields.clone()), | ||
false, | ||
)), | ||
] | ||
.into(); | ||
let boolean = Arc::new(BooleanArray::from(vec![false, true])); | ||
let int = Arc::new(Int32Array::from(vec![42, 28])); | ||
let struct_array: Arc<_> = StructArray::new(sub_fields, vec![boolean, int], None).into(); | ||
let struct_array = StructArray::new( | ||
fields.clone(), | ||
vec![struct_array.clone(), struct_array], | ||
None, | ||
); | ||
|
||
// construct the expect any value struct array. | ||
let struct_sub_ty = Arc::new(Struct::new(vec![ | ||
Field::required(0, "c", Primitive::Boolean.into()), | ||
Field::required(1, "d", Primitive::Int.into()), | ||
])); | ||
let struct_ty = Arc::new(Struct::new(vec![ | ||
Field::required(0, "a", Any::Struct(struct_sub_ty.clone())), | ||
Field::required(1, "b", Any::Struct(struct_sub_ty.clone())), | ||
])); | ||
let mut expect: Vec<Option<AnyValue>> = Vec::with_capacity(4); | ||
let mut struct_builder = StructValueBuilder::new(struct_ty.clone()); | ||
let mut sub_struct_builder = StructValueBuilder::new(struct_sub_ty.clone()); | ||
sub_struct_builder | ||
.add_field(0, Some(PrimitiveValue::Boolean(false).into())) | ||
.unwrap(); | ||
sub_struct_builder | ||
.add_field(1, Some(PrimitiveValue::Int(42).into())) | ||
.unwrap(); | ||
let sub_struct_value = sub_struct_builder.build().unwrap(); | ||
struct_builder | ||
.add_field(0, Some(sub_struct_value.clone().into())) | ||
.unwrap(); | ||
struct_builder | ||
.add_field(1, Some(sub_struct_value.into())) | ||
.unwrap(); | ||
expect.push(Some(struct_builder.build().unwrap().into())); | ||
|
||
let mut struct_builder = StructValueBuilder::new(struct_ty); | ||
let mut sub_struct_builder = StructValueBuilder::new(struct_sub_ty); | ||
sub_struct_builder | ||
.add_field(0, Some(PrimitiveValue::Boolean(true).into())) | ||
.unwrap(); | ||
sub_struct_builder | ||
.add_field(1, Some(PrimitiveValue::Int(28).into())) | ||
.unwrap(); | ||
let sub_struct_value = sub_struct_builder.build().unwrap(); | ||
struct_builder | ||
.add_field(0, Some(sub_struct_value.clone().into())) | ||
.unwrap(); | ||
struct_builder | ||
.add_field(1, Some(sub_struct_value.into())) | ||
.unwrap(); | ||
expect.push(Some(struct_builder.build().unwrap().into())); | ||
|
||
let struct_ty: Any = ArrowDataType::Struct(fields).try_into().unwrap(); | ||
assert_eq!( | ||
struct_to_anyvalue_array_with_type(&struct_array, struct_ty).unwrap(), | ||
expect | ||
); | ||
} | ||
} |
Oops, something went wrong.