Skip to content

Apache DataFusion SQL Query Engine

feat!: pass input schema to ExprPlanner::plan_scalar (#26177)

fys396ea7c19e77
diff --git a/datafusion/expr/src/planner.rs b/datafusion/expr/src/planner.rs
index 31aad67d17..ed13209521 100644
--- a/datafusion/expr/src/planner.rs
+++ b/datafusion/expr/src/planner.rs
@@ -266,7 +266,11 @@ pub trait ExprPlanner: Debug + Send + Sync {
/// Plans scalar functions, such as `ABS(<expr>)`
///
/// Returns the original scalar function if not possible
- fn plan_scalar(&self, expr: RawScalarExpr) -> Result<PlannerResult<RawScalarExpr>> {
+ fn plan_scalar(
+ &self,
+ expr: RawScalarExpr,
+ _schema: &DFSchema,
+ ) -> Result<PlannerResult<RawScalarExpr>> {
Ok(PlannerResult::Original(expr))
}
diff --git a/datafusion/sql/src/expr/function.rs b/datafusion/sql/src/expr/function.rs
index f3e4c79740..1a481dc386 100644
--- a/datafusion/sql/src/expr/function.rs
+++ b/datafusion/sql/src/expr/function.rs
@@ -352,7 +352,7 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
};
for planner in self.context_provider.get_expr_planners().iter() {
- match planner.plan_scalar(scalar_expr)? {
+ match planner.plan_scalar(scalar_expr, schema)? {
PlannerResult::Planned(expr) => return Ok(expr),
PlannerResult::Original(expr) => scalar_expr = expr,
}
diff --git a/datafusion/sql/tests/sql_integration.rs b/datafusion/sql/tests/sql_integration.rs
index 5a48c52ef5..7ab57a86f9 100644
--- a/datafusion/sql/tests/sql_integration.rs
+++ b/datafusion/sql/tests/sql_integration.rs
@@ -28,10 +28,10 @@ use arrow::datatypes::{TimeUnit::Nanosecond, *};
use common::MockContextProvider;
use datafusion_common::{DFSchema, DataFusionError, Result, assert_contains};
use datafusion_expr::{
- ColumnarValue, CreateIndex, DdlStatement, Expr, HigherOrderFunctionArgs,
- HigherOrderReturnFieldArgs, HigherOrderSignature, HigherOrderUDF, HigherOrderUDFImpl,
- LambdaParametersProgress, ScalarFunctionArgs, ScalarUDF, ScalarUDFImpl, Signature,
- ValueOrLambda, Volatility, col,
+ ColumnarValue, CreateIndex, DdlStatement, Expr, ExprSchemable,
+ HigherOrderFunctionArgs, HigherOrderReturnFieldArgs, HigherOrderSignature,
+ HigherOrderUDF, HigherOrderUDFImpl, LambdaParametersProgress, ScalarFunctionArgs,
+ ScalarUDF, ScalarUDFImpl, Signature, ValueOrLambda, Volatility, col,
expr::{HigherOrderFunction, LambdaVariable, ScalarFunction},
lambda,
logical_plan::LogicalPlan,
@@ -910,10 +910,15 @@ fn select_scalar_func_with_literal_no_relation() {
struct SingleArgumentCoalescePlanner;
impl ExprPlanner for SingleArgumentCoalescePlanner {
- fn plan_scalar(&self, expr: RawScalarExpr) -> Result<PlannerResult<RawScalarExpr>> {
+ fn plan_scalar(
+ &self,
+ expr: RawScalarExpr,
+ schema: &DFSchema,
+ ) -> Result<PlannerResult<RawScalarExpr>> {
if expr.func.name() == "coalesce"
&& let [arg] = expr.args.as_slice()
{
+ assert_eq!(arg.get_type(schema)?, DataType::Int64);
Ok(PlannerResult::Planned(arg.clone()))
} else {
Ok(PlannerResult::Original(expr))
@@ -927,7 +932,7 @@ fn select_scalar_func_with_expr_planner() -> Result<()> {
.with_scalar_function(core_functions::coalesce())
.with_expr_planner(Arc::new(SingleArgumentCoalescePlanner));
let plan = logical_plan_from_state(
- "SELECT coalesce(42)",
+ "SELECT coalesce(t.a) FROM (SELECT 42 AS a) AS t",
&GenericDialect {},
ParserOptions::default(),
state,
@@ -935,8 +940,10 @@ fn select_scalar_func_with_expr_planner() -> Result<()> {
assert_snapshot!(
plan,
@r"
- Projection: Int64(42)
- EmptyRelation: rows=1
+ Projection: t.a
+ SubqueryAlias: t
+ Projection: Int64(42) AS a
+ EmptyRelation: rows=1
"
);
Ok(())