Skip to content

Commit

Permalink
refactor code
Browse files Browse the repository at this point in the history
  • Loading branch information
chunshao90 committed Feb 7, 2023
1 parent 5d3804f commit d940b72
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
1 change: 0 additions & 1 deletion common_types/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ impl TryFrom<ArrowSchemaRef> for RecordSchema {

fn try_from(arrow_schema: ArrowSchemaRef) -> Result<Self> {
let fields = arrow_schema.fields();
println!("fields {:?}", fields);
let mut columns = Vec::with_capacity(fields.len());

for field in fields {
Expand Down
24 changes: 2 additions & 22 deletions interpreters/src/insert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ use datafusion::{
create_physical_expr, execution_props::ExecutionProps, expressions::TryCastExpr,
},
};
use datafusion_expr::{expr::Expr as DfLogicalExpr, Expr};
use datafusion_optimizer::simplify_expressions::{ExprSimplifier, SimplifyContext, SimplifyInfo};
use datafusion_expr::{expr::Expr as DfLogicalExpr};
use datafusion_optimizer::simplify_expressions::{ExprSimplifier, SimplifyContext};
use df_operator::visitor::find_columns_by_expr;
use snafu::{OptionExt, ResultExt, Snafu};
use sql::plan::InsertPlan;
Expand Down Expand Up @@ -198,26 +198,6 @@ impl<'a> TsidBuilder<'a> {
}
}

// Copy from https://github.com/apache/arrow-datafusion/blob/125a8580c19c78c99fbbe3a6afe373de2538b205/datafusion/optimizer/src/simplify_expressions/expr_simplifier.rs#L78.
#[derive(Default)]
struct Info {
execution_props: ExecutionProps,
}

impl SimplifyInfo for Info {
fn is_boolean_type(&self, _expr: &Expr) -> datafusion::common::Result<bool> {
Ok(false)
}

fn nullable(&self, _expr: &Expr) -> datafusion::common::Result<bool> {
Ok(true)
}

fn execution_props(&self) -> &ExecutionProps {
&self.execution_props
}
}

/// Fill missing columns which can be calculated via default value expr.
fn fill_default_values(
table: TableRef,
Expand Down

0 comments on commit d940b72

Please sign in to comment.