Skip to content

Improve error message and comments #641

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
merged 1 commit into from
Jun 30, 2021
Merged

Improve error message and comments #641

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions datafusion/src/logical_plan/dfschema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ impl DFSchema {
}
}
Err(DataFusionError::Plan(format!(
"No field matches column '{}'",
col,
"No field matches column '{}'. Available fields: {}",
col, self
)))
}

Expand Down
10 changes: 8 additions & 2 deletions datafusion/src/logical_plan/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ impl Column {
}
}

/// Normalize Column with qualifier based on provided dataframe schemas.
/// Normalizes `self` if is unqualified (has no relation name)
/// with an explicit qualifier from the first matching input
/// schemas.
///
/// For example, `foo` will be normalized to `t.foo` if there is a
/// column named `foo` in a relation named `t` found in `schemas`
pub fn normalize(self, schemas: &[&DFSchemaRef]) -> Result<Self> {
if self.relation.is_some() {
return Ok(self);
Expand Down Expand Up @@ -1113,7 +1118,8 @@ pub fn columnize_expr(e: Expr, input_schema: &DFSchema) -> Expr {
}
}

/// Recursively normalize all Column expressions in a given expression tree
/// Recursively call [`Column::normalize`] on all Column expressions
/// in the `expr` expression tree.
pub fn normalize_col(e: Expr, schemas: &[&DFSchemaRef]) -> Result<Expr> {
struct ColumnNormalizer<'a, 'b> {
schemas: &'a [&'b DFSchemaRef],
Expand Down