Skip to content

Commit

Permalink
do a format round
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiayu Liu committed Jun 12, 2021
1 parent 082e35e commit 435cc79
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 20 deletions.
4 changes: 1 addition & 3 deletions ballista/rust/core/src/serde/logical_plan/to_proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1033,9 +1033,7 @@ impl TryInto<protobuf::LogicalExprNode> for &Expr {
.map(|e| e.try_into())
.collect::<Result<Vec<_>, _>>()?;
let window_frame = window_frame.map(|window_frame| {
protobuf::window_expr_node::WindowFrame::Frame(
window_frame.into(),
)
protobuf::window_expr_node::WindowFrame::Frame(window_frame.into())
});
let window_expr = Box::new(protobuf::WindowExprNode {
expr: Some(Box::new(arg.try_into()?)),
Expand Down
5 changes: 2 additions & 3 deletions datafusion/src/physical_optimizer/pruning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -522,9 +522,8 @@ fn build_predicate_expression(
// match !col (don't do so recursively)
Expr::Not(input) => {
if let Expr::Column(name) = input.as_ref() {
let expr =
build_single_column_expr(name, schema, required_columns, true)
.unwrap_or(unhandled);
let expr = build_single_column_expr(name, schema, required_columns, true)
.unwrap_or(unhandled);
return Ok(expr);
} else {
return Ok(unhandled);
Expand Down
12 changes: 3 additions & 9 deletions datafusion/src/physical_plan/hash_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -538,15 +538,9 @@ fn build_batch(
column_indices: &[ColumnIndex],
random_state: &RandomState,
) -> ArrowResult<(RecordBatch, UInt64Array)> {
let (left_indices, right_indices) = build_join_indexes(
left_data,
batch,
join_type,
on_left,
on_right,
random_state,
)
.unwrap();
let (left_indices, right_indices) =
build_join_indexes(left_data, batch, join_type, on_left, on_right, random_state)
.unwrap();

if matches!(join_type, JoinType::Semi | JoinType::Anti) {
return Ok((
Expand Down
6 changes: 1 addition & 5 deletions datafusion/src/physical_plan/planner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,7 @@ impl DefaultPhysicalPlanner {
.iter()
.map(|e| {
tuple_err((
self.create_physical_expr(
e,
&input_exec.schema(),
ctx_state,
),
self.create_physical_expr(e, &input_exec.schema(), ctx_state),
e.name(input_schema),
))
})
Expand Down

0 comments on commit 435cc79

Please sign in to comment.