Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
ovr committed Dec 28, 2020
1 parent aa9c5e9 commit c44f488
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions rust/datafusion/src/sql/planner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ use arrow::datatypes::*;

use crate::prelude::JoinType;
use sqlparser::ast::{
BinaryOperator, DataType as SQLDataType, Expr as SQLExpr, FunctionArg, Join, JoinConstraint,
JoinOperator, Query, Select, SelectItem, SetExpr, TableFactor, TableWithJoins,
UnaryOperator, Value
BinaryOperator, DataType as SQLDataType, Expr as SQLExpr, FunctionArg, Join,
JoinConstraint, JoinOperator, Query, Select, SelectItem, SetExpr, TableFactor,
TableWithJoins, UnaryOperator, Value,
};
use sqlparser::ast::{ColumnDef as SQLColumnDef, ColumnOption};
use sqlparser::ast::{OrderByExpr, Statement};
Expand Down Expand Up @@ -90,7 +90,11 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
/// Generate a logical plan from an SQL statement
pub fn sql_statement_to_plan(&self, sql: &Statement) -> Result<LogicalPlan> {
match sql {
Statement::Explain { verbose, statement, analyze: _ } => self.explain_statement_to_plan(*verbose, &statement),
Statement::Explain {
verbose,
statement,
analyze: _,
} => self.explain_statement_to_plan(*verbose, &statement),
Statement::Query(query) => self.query_to_plan(&query),
_ => Err(DataFusionError::NotImplemented(
"Only SELECT statements are implemented".to_string(),
Expand Down Expand Up @@ -326,7 +330,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
TableFactor::Derived { subquery, .. } => self.query_to_plan(subquery),
TableFactor::NestedJoin(table_with_joins) => {
self.plan_table_with_joins(table_with_joins)
},
}
// @todo Support TableFactory::TableFunction?
_ => Err(DataFusionError::NotImplemented(format!(
"Unsupported ast node {:?} in create_relation",
Expand Down Expand Up @@ -618,7 +622,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
FunctionArg::Unnamed(value) => self.sql_expr_to_logical_expr(value),
}
}

fn sql_expr_to_logical_expr(&self, sql: &SQLExpr) -> Result<Expr> {
match sql {
SQLExpr::Value(Value::Number(n)) => match n.parse::<i64>() {
Expand Down Expand Up @@ -738,7 +742,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
// not a literal, apply negative operator on expression
_ => Ok(Expr::Negative(Box::new(self.sql_expr_to_logical_expr(expr)?))),
}
},
}
_ => Err(DataFusionError::NotImplemented(format!(
"Unsupported SQL unary operator {:?}",
op
Expand Down Expand Up @@ -812,7 +816,9 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
.args
.iter()
.map(|a| match a {
FunctionArg::Unnamed(SQLExpr::Value(Value::Number(_))) => Ok(lit(1_u8)),
FunctionArg::Unnamed(SQLExpr::Value(Value::Number(
_,
))) => Ok(lit(1_u8)),
FunctionArg::Unnamed(SQLExpr::Wildcard) => Ok(lit(1_u8)),
_ => self.sql_fn_arg_to_logical_expr(a),
})
Expand Down

0 comments on commit c44f488

Please sign in to comment.