Skip to content

Minor: Refactor some sql planning code into functions #4785

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
merged 1 commit into from
Jan 2, 2023
Merged

Minor: Refactor some sql planning code into functions #4785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
118 changes: 66 additions & 52 deletions datafusion/sql/src/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,48 +1986,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
expr,
substring_from,
substring_for,
} => {
let args = match (substring_from, substring_for) {
(Some(from_expr), Some(for_expr)) => {
let arg = self.sql_expr_to_logical_expr(*expr, schema, planner_context)?;
let from_logic =
self.sql_expr_to_logical_expr(*from_expr, schema, planner_context)?;
let for_logic =
self.sql_expr_to_logical_expr(*for_expr, schema, planner_context)?;
vec![arg, from_logic, for_logic]
}
(Some(from_expr), None) => {
let arg = self.sql_expr_to_logical_expr(*expr, schema, planner_context)?;
let from_logic =
self.sql_expr_to_logical_expr(*from_expr, schema, planner_context)?;
vec![arg, from_logic]
}
(None, Some(for_expr)) => {
let arg = self.sql_expr_to_logical_expr(*expr, schema, planner_context)?;
let from_logic = Expr::Literal(ScalarValue::Int64(Some(1)));
let for_logic =
self.sql_expr_to_logical_expr(*for_expr, schema, planner_context)?;
vec![arg, from_logic, for_logic]
}
(None, None) => {
let orig_sql = SQLExpr::Substring {
expr,
substring_from: None,
substring_for: None,
};

return Err(DataFusionError::Plan(format!(
"Substring without for/from is not valid {orig_sql:?}"
)));
}
};


Ok(Expr::ScalarFunction {
fun: BuiltinScalarFunction::Substr,
args,
})
}
} => self.sql_substring_to_expr(expr, substring_from, substring_for, schema, planner_context),

#[cfg(not(feature = "unicode_expressions"))]
SQLExpr::Substring {
Expand All @@ -2048,17 +2007,9 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
SQLExpr::Cube(exprs) => self.sql_cube_to_expr(exprs,schema, planner_context),
SQLExpr::GroupingSets(exprs) => self.sql_grouping_sets_to_expr(exprs, schema, planner_context),

SQLExpr::Floor { expr, field: _field } => {
let fun = BuiltinScalarFunction::Floor;
let args = vec![self.sql_expr_to_logical_expr(*expr, schema, planner_context)?];
Ok(Expr::ScalarFunction { fun, args })
}
SQLExpr::Floor { expr, field: _field } => self.sql_named_function_to_expr(*expr, BuiltinScalarFunction::Floor, schema, planner_context),

SQLExpr::Ceil { expr, field: _field } => {
let fun = BuiltinScalarFunction::Ceil;
let args = vec![self.sql_expr_to_logical_expr(*expr, schema, planner_context)?];
Ok(Expr::ScalarFunction { fun, args })
}
SQLExpr::Ceil { expr, field: _field } => self.sql_named_function_to_expr(*expr, BuiltinScalarFunction::Ceil, schema, planner_context),

SQLExpr::Nested(e) => self.sql_expr_to_logical_expr(*e, schema, planner_context),

Expand Down Expand Up @@ -2183,6 +2134,69 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
}
}

fn sql_named_function_to_expr(
&self,
expr: SQLExpr,
fun: BuiltinScalarFunction,
schema: &DFSchema,
planner_context: &mut PlannerContext,
) -> Result<Expr> {
let args = vec![self.sql_expr_to_logical_expr(expr, schema, planner_context)?];
Ok(Expr::ScalarFunction { fun, args })
}

fn sql_substring_to_expr(
&self,
expr: Box<SQLExpr>,
substring_from: Option<Box<SQLExpr>>,
substring_for: Option<Box<SQLExpr>>,
schema: &DFSchema,
planner_context: &mut PlannerContext,
) -> Result<Expr> {
let args = match (substring_from, substring_for) {
(Some(from_expr), Some(for_expr)) => {
let arg =
self.sql_expr_to_logical_expr(*expr, schema, planner_context)?;
let from_logic =
self.sql_expr_to_logical_expr(*from_expr, schema, planner_context)?;
let for_logic =
self.sql_expr_to_logical_expr(*for_expr, schema, planner_context)?;
vec![arg, from_logic, for_logic]
}
(Some(from_expr), None) => {
let arg =
self.sql_expr_to_logical_expr(*expr, schema, planner_context)?;
let from_logic =
self.sql_expr_to_logical_expr(*from_expr, schema, planner_context)?;
vec![arg, from_logic]
}
(None, Some(for_expr)) => {
let arg =
self.sql_expr_to_logical_expr(*expr, schema, planner_context)?;
let from_logic = Expr::Literal(ScalarValue::Int64(Some(1)));
let for_logic =
self.sql_expr_to_logical_expr(*for_expr, schema, planner_context)?;
vec![arg, from_logic, for_logic]
}
(None, None) => {
let orig_sql = SQLExpr::Substring {
expr,
substring_from: None,
substring_for: None,
};

return Err(DataFusionError::Plan(format!(
"Substring without for/from is not valid {orig_sql:?}"
)));
}
};

Ok(Expr::ScalarFunction {
fun: BuiltinScalarFunction::Substr,
args,
})
}

fn sql_in_list_to_expr(
&self,
expr: SQLExpr,
Expand Down