wlhjason commented on code in PR #20597:
URL: https://github.com/apache/datafusion/pull/20597#discussion_r3293520824
##########
datafusion/substrait/src/logical_plan/producer/expr/scalar_function.rs:
##########
@@ -15,33 +15,41 @@
// specific language governing permissions and limitations
// under the License.
-use crate::logical_plan::producer::{SubstraitProducer,
to_substrait_literal_expr};
+use crate::logical_plan::producer::{
+ SubstraitProducer, to_substrait_literal_expr, to_substrait_type,
+};
+use datafusion::arrow::datatypes::Field;
use datafusion::common::{DFSchemaRef, ScalarValue, not_impl_err};
-use datafusion::logical_expr::{Between, BinaryExpr, Expr, Like, Operator,
expr};
+use datafusion::logical_expr::{
+ Between, BinaryExpr, Expr, ExprSchemable, Like, Operator, expr,
+};
use substrait::proto::expression::{RexType, ScalarFunction};
use substrait::proto::function_argument::ArgType;
-use substrait::proto::{Expression, FunctionArgument};
+use substrait::proto::{Expression, FunctionArgument, Type};
pub fn from_scalar_function(
producer: &mut impl SubstraitProducer,
fun: &expr::ScalarFunction,
schema: &DFSchemaRef,
) -> datafusion::common::Result<Expression> {
- from_function(producer, fun.name(), &fun.args, schema)
+ let (_, output_field) =
Expr::ScalarFunction(fun.clone()).to_field(schema)?;
+ from_function(producer, fun.name(), &fun.args, &output_field, schema)
}
pub fn from_higher_order_function(
producer: &mut impl SubstraitProducer,
fun: &expr::HigherOrderFunction,
schema: &DFSchemaRef,
) -> datafusion::common::Result<Expression> {
- from_function(producer, fun.name(), &fun.args, schema)
+ let (_, output_field) =
Expr::HigherOrderFunction(fun.clone()).to_field(schema)?;
+ from_function(producer, fun.name(), &fun.args, &output_field, schema)
}
fn from_function(
producer: &mut impl SubstraitProducer,
name: &str,
args: &[Expr],
+ output_field: &Field,
Review Comment:
Changed to just require a `DataType` and nullability
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
