Skip to content

[SPARK-39783] Do not parse already qualified identifiers for UNRESOLVED_COLUMN AnalysisException #38254

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

Closed
sadikovi wants to merge 1 commit into from
Closed

[SPARK-39783] Do not parse already qualified identifiers for UNRESOLVED_COLUMN AnalysisException #38254

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 sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3444,13 +3444,13 @@ class Analyzer(override val catalogManager: CatalogManager)
private def resolveUserSpecifiedColumns(i: InsertIntoStatement): Seq[NamedExpression] = {
SchemaUtils.checkColumnNameDuplication(
i.userSpecifiedCols, "in the column list", resolver)

i.userSpecifiedCols.map { col =>
i.table.resolve(Seq(col), resolver).getOrElse {
val candidates = i.table.output.map(_.name)
val orderedCandidates = StringUtils.orderStringsBySimilarity(col, candidates)
val qualifiedCandidates = orderedCandidates.map(Seq(_))
throw QueryCompilationErrors
.unresolvedAttributeError("UNRESOLVED_COLUMN", col, orderedCandidates, i.origin)
.unresolvedAttributeError("UNRESOLVED_COLUMN", col, qualifiedCandidates, i.origin)
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,11 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog {
errorClass: String): Nothing = {
val missingCol = a.sql
val candidates = operator.inputSet.toSeq.map(_.qualifiedName)
// Because the names are already qualified, do not attempt to parse them again.
val orderedCandidates = StringUtils.orderStringsBySimilarity(missingCol, candidates)
val qualifiedCandidates = orderedCandidates.map(Seq(_))
throw QueryCompilationErrors.unresolvedAttributeError(
errorClass, missingCol, orderedCandidates, a.origin)
errorClass, missingCol, qualifiedCandidates, a.origin)
}

def checkAnalysis(plan: LogicalPlan): Unit = {
Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase {
def unresolvedAttributeError(
errorClass: String,
colName: String,
candidates: Seq[String],
candidates: Seq[Seq[String]],
origin: Origin): Throwable = {
val commonParam = Map("objectName" -> toSQLId(colName))
val proposalParam = if (candidates.isEmpty) {
Expand Down