Skip to content

refactor: remove redundant build_join_schema() #4538

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
alamb merged 1 commit into from
Dec 7, 2022
Merged

refactor: remove redundant build_join_schema() #4538

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
29 changes: 13 additions & 16 deletions datafusion/optimizer/src/eliminate_cross_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

//! Optimizer rule to eliminate cross join to inner join if join predicates are available in filters.
use crate::{utils, OptimizerConfig, OptimizerRule};
use datafusion_common::{Column, DFSchema, DataFusionError, Result};
use datafusion_common::{Column, DataFusionError, Result};
use datafusion_expr::{
and,
and, build_join_schema,
expr::BinaryExpr,
logical_plan::{CrossJoin, Filter, Join, JoinType, LogicalPlan},
or,
Expand All @@ -28,7 +28,7 @@ use datafusion_expr::{
};
use datafusion_expr::{Expr, Operator};

use std::collections::{HashMap, HashSet};
use std::collections::HashSet;

//use std::collections::HashMap;
use datafusion_expr::logical_plan::JoinConstraint;
Expand Down Expand Up @@ -207,7 +207,11 @@ fn find_inner_join(
if !join_keys.is_empty() {
all_join_keys.extend(join_keys.clone());
let right = rights.remove(i);
let join_schema = Arc::new(build_join_schema(left, &right)?);
let join_schema = Arc::new(build_join_schema(
left.schema(),
right.schema(),
&JoinType::Inner,
)?);
return Ok(LogicalPlan::Join(Join {
left: Arc::new(left.clone()),
right: Arc::new(right),
Expand All @@ -221,7 +225,11 @@ fn find_inner_join(
}
}
let right = rights.remove(0);
let join_schema = Arc::new(build_join_schema(left, &right)?);
let join_schema = Arc::new(build_join_schema(
left.schema(),
right.schema(),
&JoinType::Inner,
)?);

Ok(LogicalPlan::CrossJoin(CrossJoin {
left: Arc::new(left.clone()),
Expand All @@ -230,17 +238,6 @@ fn find_inner_join(
}))
}

fn build_join_schema(left: &LogicalPlan, right: &LogicalPlan) -> Result<DFSchema> {
// build join schema
let mut fields = vec![];
let mut metadata = HashMap::new();
fields.extend(left.schema().fields().clone());
fields.extend(right.schema().fields().clone());
metadata.extend(left.schema().metadata().clone());
metadata.extend(right.schema().metadata().clone());
DFSchema::new_with_metadata(fields, metadata)
}

fn intersect(
accum: &mut Vec<(Column, Column)>,
vec1: &[(Column, Column)],
Expand Down