Skip to content

Minor: Improvements to type coercion rule #3379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andygrove merged 2 commits into from
Sep 6, 2022
Merged

Minor: Improvements to type coercion rule #3379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bba3997
Clean up code in type_coercion.rs
alamb Sep 6, 2022
c3f9f27
fix: improve error message
alamb Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 8 additions & 28 deletions datafusion/optimizer/src/type_coercion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
//! Optimizer rule for type validation and coercion

use crate::{OptimizerConfig, OptimizerRule};
use arrow::datatypes::DataType;
use datafusion_common::{DFSchema, DFSchemaRef, Result};
use datafusion_expr::binary_rule::coerce_types;
use datafusion_expr::expr_rewriter::{ExprRewritable, ExprRewriter, RewriteRecursion};
Expand Down Expand Up @@ -86,37 +85,18 @@ impl ExprRewriter for TypeCoercionRewriter {
}

fn mutate(&mut self, expr: Expr) -> Result<Expr> {
match &expr {
match expr {
Expr::BinaryExpr { left, op, right } => {
let left_type = left.get_type(&self.schema)?;
let right_type = right.get_type(&self.schema)?;
match right_type {
DataType::Interval(_) => {
Copy link
Contributor Author

@alamb alamb Sep 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the special case pointed out by @liukun4515 as it does not seem to be needed anymore

// we don't want to cast intervals because that breaks
// the logic in the physical planner
Ok(expr)
}
_ => {
let coerced_type = coerce_types(&left_type, op, &right_type)?;
let left = left.clone().cast_to(&coerced_type, &self.schema)?;
let right = right.clone().cast_to(&coerced_type, &self.schema)?;
match (&left, &right) {
(Expr::Cast { .. }, _) | (_, Expr::Cast { .. }) => {
Ok(Expr::BinaryExpr {
left: Box::new(left),
op: *op,
right: Box::new(right),
})
}
_ => {
// no cast was added so we return the original expression
Ok(expr)
}
}
}
}
let coerced_type = coerce_types(&left_type, &op, &right_type)?;
Ok(Expr::BinaryExpr {
left: Box::new(left.cast_to(&coerced_type, &self.schema)?),
op,
right: Box::new(right.cast_to(&coerced_type, &self.schema)?),
})
}
_ => Ok(expr),
expr => Ok(expr),
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions datafusion/physical-expr/src/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ pub fn create_physical_expr(
execution_props: &ExecutionProps,
) -> Result<Arc<dyn PhysicalExpr>> {
if input_schema.fields.len() != input_dfschema.fields().len() {
return Err(DataFusionError::Internal(
"create_physical_expr passed Arrow schema and DataFusion \
schema with different number of fields"
.to_string(),
));
return Err(DataFusionError::Internal(format!(
"create_physical_expr expected same number of fields, got \
got Arrow schema with {} and DataFusion schema with {}",
input_schema.fields.len(),
input_dfschema.fields().len()
)));
}
match e {
Expr::Alias(expr, ..) => Ok(create_physical_expr(
Expand Down