mingmwang commented on code in PR #4185:
URL: https://github.com/apache/arrow-datafusion/pull/4185#discussion_r1020913030
##########
datafusion/sql/src/planner.rs:
##########
@@ -857,166 +858,52 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
outer_query_schema: Option<&DFSchema>,
ctes: &mut HashMap<String, LogicalPlan>,
) -> Result<LogicalPlan> {
+ let cross_join_plan = if plans.len() == 1 {
+ plans[0].clone()
+ } else {
+ let mut left = plans[0].clone();
+ for right in plans.iter().skip(1) {
+ left =
LogicalPlanBuilder::from(left).cross_join(right)?.build()?;
+ }
+ left
+ };
match selection {
Some(predicate_expr) => {
- // build join schema
let mut fields = vec![];
- let mut metadata = std::collections::HashMap::new();
+ let mut metadata = HashMap::new();
for plan in &plans {
fields.extend_from_slice(plan.schema().fields());
metadata.extend(plan.schema().metadata().clone());
}
+
let mut join_schema = DFSchema::new_with_metadata(fields,
metadata)?;
+ let mut all_schemas: Vec<DFSchemaRef> = vec![];
+ for plan in plans {
+ for schema in plan.all_schemas() {
+ all_schemas.push(schema.clone());
+ }
+ }
if let Some(outer) = outer_query_schema {
+ all_schemas.push(Arc::new(outer.clone()));
join_schema.merge(outer);
}
+ let x: Vec<&DFSchemaRef> = all_schemas.iter().collect();
let filter_expr = self.sql_to_rex(predicate_expr,
&join_schema, ctes)?;
+ let mut using_columns = HashSet::new();
+ expr_to_columns(&filter_expr, &mut using_columns)?;
+ let filter_expr = normalize_col_with_schemas(
+ filter_expr,
+ x.as_slice(),
+ &[using_columns],
+ )?;
- // look for expressions of the form `<column> = <column>`
- let mut possible_join_keys = vec![];
Review Comment:
Glad to see those logic is moved out from the planner.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
