From 96a6204b24dc01cf06bf1e3ad9f5f26772e4b1df Mon Sep 17 00:00:00 2001 From: Alex Qyoun-ae <4062971+MazterQyou@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:31:48 +0300 Subject: [PATCH] fix: Ignore equal expression names in projection --- datafusion/src/logical_plan/builder.rs | 1 - datafusion/src/logical_plan/dfschema.rs | 41 ------------------------- 2 files changed, 42 deletions(-) diff --git a/datafusion/src/logical_plan/builder.rs b/datafusion/src/logical_plan/builder.rs index 09c3a14513e5..fba5ae3a8f2b 100644 --- a/datafusion/src/logical_plan/builder.rs +++ b/datafusion/src/logical_plan/builder.rs @@ -810,7 +810,6 @@ pub fn project_with_alias( .push(columnize_expr(normalize_col(e, &plan)?, input_schema)), } } - validate_unique_names("Projections", projected_expr.iter(), input_schema)?; let input_schema = DFSchema::new(exprlist_to_fields(&projected_expr, input_schema)?)?; let schema = match alias { Some(ref alias) => input_schema.replace_qualifier(alias.as_str()), diff --git a/datafusion/src/logical_plan/dfschema.rs b/datafusion/src/logical_plan/dfschema.rs index 126c0d88667b..539a08b4803f 100644 --- a/datafusion/src/logical_plan/dfschema.rs +++ b/datafusion/src/logical_plan/dfschema.rs @@ -18,7 +18,6 @@ //! DFSchema is an extended schema struct that DataFusion uses to provide support for //! fields with optional relation names. -use std::collections::HashSet; use std::convert::TryFrom; use std::sync::Arc; @@ -46,46 +45,6 @@ impl DFSchema { /// Create a new `DFSchema` pub fn new(fields: Vec) -> Result { - let mut qualified_names = HashSet::new(); - let mut unqualified_names = HashSet::new(); - - for field in &fields { - if let Some(qualifier) = field.qualifier() { - if !qualified_names.insert((qualifier, field.name())) { - return Err(DataFusionError::Plan(format!( - "Schema contains duplicate qualified field name '{}'", - field.qualified_name() - ))); - } - } else if !unqualified_names.insert(field.name()) { - return Err(DataFusionError::Plan(format!( - "Schema contains duplicate unqualified field name '{}'", - field.name() - ))); - } - } - - // check for mix of qualified and unqualified field with same unqualified name - // note that we need to sort the contents of the HashSet first so that errors are - // deterministic - let mut qualified_names = qualified_names - .iter() - .map(|(l, r)| (l.to_owned(), r.to_owned())) - .collect::>(); - qualified_names.sort_by(|a, b| { - let a = format!("{}.{}", a.0, a.1); - let b = format!("{}.{}", b.0, b.1); - a.cmp(&b) - }); - for (qualifier, name) in &qualified_names { - if unqualified_names.contains(name) { - return Err(DataFusionError::Plan(format!( - "Schema contains qualified field name '{}.{}' \ - and unqualified field name '{}' which would be ambiguous", - qualifier, name, name - ))); - } - } Ok(Self { fields }) }