jayzhan211 commented on code in PR #9343:
URL: https://github.com/apache/arrow-datafusion/pull/9343#discussion_r1504228887
##########
datafusion/physical-expr/src/functions.rs:
##########
@@ -320,15 +320,12 @@ pub fn create_physical_fun(
}
// array functions
- BuiltinScalarFunction::ArrayAppend => Arc::new(|args| {
- make_scalar_function_inner(array_expressions::array_append)(args)
- }),
+ // BuiltinScalarFunction::ArrayAppend => Arc::new(|args| {
Review Comment:
You can delete it
##########
datafusion/optimizer/src/analyzer/rewrite_expr.rs:
##########
@@ -159,97 +162,61 @@ fn rewrite_array_concat_operator_to_func(
// (arry concat, array append, array prepend) || array -> array concat
(
Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayConcat),
+ func_def: ScalarFunctionDefinition::UDF(left_fun),
args: _left_args,
}),
Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::MakeArray),
+ func_def: ScalarFunctionDefinition::UDF(right_fun),
args: _right_args,
}),
- )
- | (
- Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayAppend),
- args: _left_args,
- }),
- Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::MakeArray),
- args: _right_args,
- }),
- )
- | (
- Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayPrepend),
- args: _left_args,
- }),
- Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::MakeArray),
- args: _right_args,
- }),
- ) => Some(BuiltinScalarFunction::ArrayConcat),
+ ) if ["array_append", "array_prepend", "array_concat"]
+ .contains(&left_fun.name())
+ && right_fun.name() == "make_array" =>
+ {
+ Some(array_concat_udf())
+ }
// Chain concat operator (a || b) || scalar,
// (arry concat, array append, array prepend) || scalar -> array append
(
Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayConcat),
+ func_def: ScalarFunctionDefinition::UDF(left_fun),
args: _left_args,
}),
_scalar,
- )
- | (
- Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayAppend),
- args: _left_args,
- }),
- _scalar,
- )
- | (
- Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::ArrayPrepend),
- args: _left_args,
- }),
- _scalar,
- ) => Some(BuiltinScalarFunction::ArrayAppend),
+ ) if ["array_append", "array_prepend", "array_concat"]
+ .contains(&left_fun.name()) =>
+ {
+ Some(array_append_udf())
+ }
// array || array -> array concat
(
Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::MakeArray),
+ func_def: ScalarFunctionDefinition::UDF(left_fun),
args: _left_args,
}),
Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::MakeArray),
+ func_def: ScalarFunctionDefinition::UDF(right_fun),
args: _right_args,
}),
- ) => Some(BuiltinScalarFunction::ArrayConcat),
+ ) if left_fun.name() == "make_array" && right_fun.name() ==
"make_array" => {
+ Some(array_concat_udf())
+ }
// array || scalar -> array append
(
Expr::ScalarFunction(ScalarFunction {
- func_def:
-
ScalarFunctionDefinition::BuiltIn(BuiltinScalarFunction::MakeArray),
+ func_def: ScalarFunctionDefinition::UDF(left_fun),
args: _left_args,
}),
_right_scalar,
- ) => Some(BuiltinScalarFunction::ArrayAppend),
+ ) if left_fun.name() == "make_array" => Some(array_append_udf()),
Review Comment:
I though `array_append_udf` should be private 🤔
##########
datafusion/functions-array/src/macros.rs:
##########
@@ -45,14 +45,14 @@
///
/// [`ScalarUDFImpl`]: datafusion_expr::ScalarUDFImpl
macro_rules! make_udf_function {
- ($UDF:ty, $EXPR_FN:ident, $($arg:ident)*, $DOC:expr ,
$SCALAR_UDF_FN:ident) => {
+ ($UDF:ty, $EXPR_FN:ident, $arg:ident, $DOC:expr , $SCALAR_UDF_FN:ident) =>
{
Review Comment:
why is this change to vec? previous syntax is able to parse arbitrary args
--
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]
