jayzhan211 commented on code in PR #7280:
URL: https://github.com/apache/arrow-datafusion/pull/7280#discussion_r1294502984
##########
datafusion/physical-expr/src/array_expressions.rs:
##########
@@ -2079,16 +1809,16 @@ macro_rules! array_has_all_non_list_check {
/// Array_has_all SQL function
pub fn array_has_all(args: &[ArrayRef]) -> Result<ArrayRef> {
- assert_eq!(args.len(), 2);
+ check_datatypes("array_has_all", &[&args[0], &args[1]])?;
- let array = args[0].as_list::<i32>();
- let sub_array = args[1].as_list::<i32>();
+ let array = as_list_array(&args[0])?;
+ let sub_array = as_list_array(&args[1])?;
let mut boolean_builder = BooleanArray::builder(array.len());
for (arr, sub_arr) in array.iter().zip(sub_array.iter()) {
if let (Some(arr), Some(sub_arr)) = (arr, sub_arr) {
- let res = match (arr.data_type(), sub_arr.data_type()) {
- (DataType::List(_), DataType::List(_)) => {
+ let res = match arr.data_type() {
Review Comment:
Is it safe to only check arr type not sub_arr type?
##########
datafusion/physical-expr/src/array_expressions.rs:
##########
@@ -637,37 +662,20 @@ macro_rules! append {
/// Array_append SQL function
pub fn array_append(args: &[ArrayRef]) -> Result<ArrayRef> {
- if args.len() != 2 {
- return Err(DataFusionError::Internal(format!(
- "Array_append function requires two arguments, got {}",
- args.len()
- )));
- }
-
let arr = as_list_array(&args[0])?;
let element = &args[1];
- let res = match (arr.value_type(), element.data_type()) {
- (DataType::List(_), DataType::List(_)) =>
concat_internal(args)?,
- (DataType::Utf8, DataType::Utf8) => append!(arr, element,
StringArray),
- (DataType::LargeUtf8, DataType::LargeUtf8) => append!(arr,
element, LargeStringArray),
- (DataType::Boolean, DataType::Boolean) => append!(arr,
element, BooleanArray),
- (DataType::Float32, DataType::Float32) => append!(arr,
element, Float32Array),
- (DataType::Float64, DataType::Float64) => append!(arr,
element, Float64Array),
- (DataType::Int8, DataType::Int8) => append!(arr, element,
Int8Array),
- (DataType::Int16, DataType::Int16) => append!(arr, element,
Int16Array),
- (DataType::Int32, DataType::Int32) => append!(arr, element,
Int32Array),
- (DataType::Int64, DataType::Int64) => append!(arr, element,
Int64Array),
- (DataType::UInt8, DataType::UInt8) => append!(arr, element,
UInt8Array),
- (DataType::UInt16, DataType::UInt16) => append!(arr, element,
UInt16Array),
- (DataType::UInt32, DataType::UInt32) => append!(arr, element,
UInt32Array),
- (DataType::UInt64, DataType::UInt64) => append!(arr, element,
UInt64Array),
- (DataType::Null, _) => return
Ok(array(&[ColumnarValue::Array(args[1].clone())])?.into_array(1)),
- (array_data_type, element_data_type) => {
- return Err(DataFusionError::NotImplemented(format!(
- "Array_append is not implemented for types
'{array_data_type:?}' and '{element_data_type:?}'."
- )))
- }
+ check_datatypes("array_append", &[arr.values(), &args[1]])?;
Review Comment:
Nit: Use `element` instead of &args[1]
##########
datafusion/physical-expr/src/array_expressions.rs:
##########
@@ -212,6 +212,60 @@ fn compute_array_dims(arr: Option<ArrayRef>) ->
Result<Option<Vec<Option<u64>>>>
}
}
+fn check_datatypes(name: &str, args: &[&ArrayRef]) -> Result<()> {
+ let data_type = args[0].data_type();
+ if !args
+ .iter()
+ .all(|arg| arg.data_type().equals_datatype(data_type))
+ {
+ return Err(DataFusionError::NotImplemented(format!(
+ "{name} is not implemented for type '{data_type:?}'."
+ )));
+ }
+
+ Ok(())
+}
+
+macro_rules! call_array_function {
+ ($DATATYPE:expr, false) => {
+ match $DATATYPE {
+ DataType::Utf8 => array_function!(StringArray),
+ DataType::LargeUtf8 => array_function!(LargeStringArray),
+ DataType::Boolean => array_function!(BooleanArray),
+ DataType::Float32 => array_function!(Float32Array),
+ DataType::Float64 => array_function!(Float64Array),
+ DataType::Int8 => array_function!(Int8Array),
+ DataType::Int16 => array_function!(Int16Array),
+ DataType::Int32 => array_function!(Int32Array),
+ DataType::Int64 => array_function!(Int64Array),
+ DataType::UInt8 => array_function!(UInt8Array),
+ DataType::UInt16 => array_function!(UInt16Array),
+ DataType::UInt32 => array_function!(UInt32Array),
+ DataType::UInt64 => array_function!(UInt64Array),
+ _ => unreachable!(),
+ }
+ };
+ ($DATATYPE:expr, $INCLUDE_LIST:expr) => {{
+ match $DATATYPE {
+ DataType::List(_) => array_function!(ListArray),
Review Comment:
Better if we use a flag to merge these two in one?
```suggestion
DataType::List(_) => if $INLCUDE_LIST
{array_function!(ListArray)} else {
unreachable!()
}
```
##########
datafusion/physical-expr/src/array_expressions.rs:
##########
@@ -1179,27 +1133,13 @@ pub fn array_positions(args: &[ArrayRef]) ->
Result<ArrayRef> {
let arr = as_list_array(&args[0])?;
let element = &args[1];
- let res = match arr.value_type() {
- DataType::List(_) => positions!(arr, element, ListArray),
- DataType::Utf8 => positions!(arr, element, StringArray),
- DataType::LargeUtf8 => positions!(arr, element, LargeStringArray),
- DataType::Boolean => positions!(arr, element, BooleanArray),
- DataType::Float32 => positions!(arr, element, Float32Array),
- DataType::Float64 => positions!(arr, element, Float64Array),
- DataType::Int8 => positions!(arr, element, Int8Array),
- DataType::Int16 => positions!(arr, element, Int16Array),
- DataType::Int32 => positions!(arr, element, Int32Array),
- DataType::Int64 => positions!(arr, element, Int64Array),
- DataType::UInt8 => positions!(arr, element, UInt8Array),
- DataType::UInt16 => positions!(arr, element, UInt16Array),
- DataType::UInt32 => positions!(arr, element, UInt32Array),
- DataType::UInt64 => positions!(arr, element, UInt64Array),
- data_type => {
- return Err(DataFusionError::NotImplemented(format!(
- "Array_positions is not implemented for types '{data_type:?}'."
- )))
- }
- };
+ check_datatypes("array_positions", &[arr.values(), &args[1]])?;
Review Comment:
Nit: Use `element` instead of &args[1]
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
