jayzhan211 commented on code in PR #9343:
URL: https://github.com/apache/arrow-datafusion/pull/9343#discussion_r1504277942
##########
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:
Probably we need array_append directly
--
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]
