Skip to content
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

Minor: Remove clone in optimizer #11315

Merged
merged 2 commits into from
Jul 7, 2024
Merged

Minor: Remove clone in optimizer #11315

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
2296bbe
rm clone
jayzhan211 Jul 7, 2024
1d01eb4
outer join + fix test
jayzhan211 Jul 7, 2024
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
34 changes: 19 additions & 15 deletions datafusion/optimizer/src/eliminate_nested_union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ use crate::{OptimizerConfig, OptimizerRule};
use datafusion_common::tree_node::Transformed;
use datafusion_common::Result;
use datafusion_expr::expr_rewriter::coerce_plan_expr_for_schema;
use datafusion_expr::logical_plan::tree_node::unwrap_arc;
use datafusion_expr::{Distinct, LogicalPlan, Union};
use itertools::Itertools;
use std::sync::Arc;

#[derive(Default)]
Expand Down Expand Up @@ -56,53 +58,55 @@ impl OptimizerRule for EliminateNestedUnion {
match plan {
LogicalPlan::Union(Union { inputs, schema }) => {
let inputs = inputs
.iter()
.into_iter()
.flat_map(extract_plans_from_union)
.collect::<Vec<_>>();

Ok(Transformed::yes(LogicalPlan::Union(Union {
inputs,
inputs: inputs.into_iter().map(Arc::new).collect_vec(),
schema,
})))
}
LogicalPlan::Distinct(Distinct::All(ref nested_plan)) => {
match nested_plan.as_ref() {
LogicalPlan::Distinct(Distinct::All(nested_plan)) => {
match unwrap_arc(nested_plan) {
LogicalPlan::Union(Union { inputs, schema }) => {
let inputs = inputs
.iter()
.into_iter()
.map(extract_plan_from_distinct)
.flat_map(extract_plans_from_union)
.collect::<Vec<_>>();

Ok(Transformed::yes(LogicalPlan::Distinct(Distinct::All(
Arc::new(LogicalPlan::Union(Union {
inputs,
inputs: inputs.into_iter().map(Arc::new).collect_vec(),
schema: schema.clone(),
})),
))))
}
_ => Ok(Transformed::no(plan)),
nested_plan => Ok(Transformed::no(LogicalPlan::Distinct(
Distinct::All(Arc::new(nested_plan)),
))),
}
}
_ => Ok(Transformed::no(plan)),
}
}
}

fn extract_plans_from_union(plan: &Arc<LogicalPlan>) -> Vec<Arc<LogicalPlan>> {
match plan.as_ref() {
fn extract_plans_from_union(plan: Arc<LogicalPlan>) -> Vec<LogicalPlan> {
match unwrap_arc(plan) {
LogicalPlan::Union(Union { inputs, schema }) => inputs
.iter()
.map(|plan| Arc::new(coerce_plan_expr_for_schema(plan, schema).unwrap()))
.into_iter()
.map(|plan| coerce_plan_expr_for_schema(&plan, &schema).unwrap())
.collect::<Vec<_>>(),
_ => vec![plan.clone()],
plan => vec![plan],
}
}

fn extract_plan_from_distinct(plan: &Arc<LogicalPlan>) -> &Arc<LogicalPlan> {
match plan.as_ref() {
fn extract_plan_from_distinct(plan: Arc<LogicalPlan>) -> Arc<LogicalPlan> {
match unwrap_arc(plan) {
LogicalPlan::Distinct(Distinct::All(plan)) => plan,
_ => plan,
plan => Arc::new(plan),
}
}

Expand Down
13 changes: 9 additions & 4 deletions datafusion/optimizer/src/eliminate_outer_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
//! [`EliminateOuterJoin`] converts `LEFT/RIGHT/FULL` joins to `INNER` joins
use crate::{OptimizerConfig, OptimizerRule};
use datafusion_common::{Column, DFSchema, Result};
use datafusion_expr::logical_plan::tree_node::unwrap_arc;
use datafusion_expr::logical_plan::{Join, JoinType, LogicalPlan};
use datafusion_expr::{Expr, Filter, Operator};

Expand Down Expand Up @@ -78,7 +79,7 @@ impl OptimizerRule for EliminateOuterJoin {
_config: &dyn OptimizerConfig,
) -> Result<Transformed<LogicalPlan>> {
match plan {
LogicalPlan::Filter(filter) => match filter.input.as_ref() {
LogicalPlan::Filter(mut filter) => match unwrap_arc(filter.input) {
LogicalPlan::Join(join) => {
let mut non_nullable_cols: Vec<Column> = vec![];

Expand Down Expand Up @@ -109,9 +110,10 @@ impl OptimizerRule for EliminateOuterJoin {
} else {
join.join_type
};

let new_join = Arc::new(LogicalPlan::Join(Join {
left: Arc::new((*join.left).clone()),
right: Arc::new((*join.right).clone()),
left: join.left,
Copy link
Contributor

Choose a reason for hiding this comment

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

nice!

right: join.right,
join_type: new_join_type,
join_constraint: join.join_constraint,
on: join.on.clone(),
Expand All @@ -122,7 +124,10 @@ impl OptimizerRule for EliminateOuterJoin {
Filter::try_new(filter.predicate, new_join)
.map(|f| Transformed::yes(LogicalPlan::Filter(f)))
}
_ => Ok(Transformed::no(LogicalPlan::Filter(filter))),
filter_input => {
filter.input = Arc::new(filter_input);
Ok(Transformed::no(LogicalPlan::Filter(filter)))
}
},
_ => Ok(Transformed::no(plan)),
}
Expand Down
4 changes: 3 additions & 1 deletion datafusion/optimizer/src/propagate_empty_relation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ impl OptimizerRule for PropagateEmptyRelation {
},
)))
} else if new_inputs.len() == 1 {
let child = unwrap_arc(new_inputs[0].clone());
let mut new_inputs = new_inputs;
let input_plan = new_inputs.pop().unwrap(); // length checked
let child = unwrap_arc(input_plan);
if child.schema().eq(plan.schema()) {
Ok(Transformed::yes(child))
} else {
Expand Down