Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class Analyzer(
logDebug(s"Resolving $u to $result")
result
case UnresolvedGetField(child, fieldName) if child.resolved =>
resolveGetField(child, fieldName)
q.resolveGetField(child, fieldName, resolver)
}
}

Expand All @@ -313,36 +313,6 @@ class Analyzer(
*/
protected def containsStar(exprs: Seq[Expression]): Boolean =
exprs.exists(_.collect { case _: Star => true }.nonEmpty)

/**
* Returns the resolved `GetField`, and report error if no desired field or over one
* desired fields are found.
*/
protected def resolveGetField(expr: Expression, fieldName: String): Expression = {
def findField(fields: Array[StructField]): Int = {
val checkField = (f: StructField) => resolver(f.name, fieldName)
val ordinal = fields.indexWhere(checkField)
if (ordinal == -1) {
throw new AnalysisException(
s"No such struct field $fieldName in ${fields.map(_.name).mkString(", ")}")
} else if (fields.indexWhere(checkField, ordinal + 1) != -1) {
throw new AnalysisException(
s"Ambiguous reference to fields ${fields.filter(checkField).mkString(", ")}")
} else {
ordinal
}
}
expr.dataType match {
case StructType(fields) =>
val ordinal = findField(fields)
StructGetField(expr, fields(ordinal), ordinal)
case ArrayType(StructType(fields), containsNull) =>
val ordinal = findField(fields)
ArrayGetField(expr, fields(ordinal), ordinal, containsNull)
case otherType =>
throw new AnalysisException(s"GetField is not valid on fields of type $otherType")
}
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,10 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with Logging {
// One match, but we also need to extract the requested nested field.
case Seq((a, nestedFields)) =>
try {

// The foldLeft adds UnresolvedGetField for every remaining parts of the name,
// and aliased it with the last part of the name.
// For example, consider name "a.b.c", where "a" is resolved to an existing attribute.
// Then this will add UnresolvedGetField("b") and UnresolvedGetField("c"), and alias
// The foldLeft adds GetFields for every remaining parts of the identifier,
// and aliases it with the last part of the identifier.
// For example, consider "a.b.c", where "a" is resolved to an existing attribute.
// Then this will add GetField("c", GetField("b", a)), and alias
// the final expression as "c".
val fieldExprs = nestedFields.foldLeft(a: Expression)(resolveGetField(_, _, resolver))
val aliasName = nestedFields.last
Expand All @@ -234,10 +233,8 @@ abstract class LogicalPlan extends QueryPlan[LogicalPlan] with Logging {
/**
* Returns the resolved `GetField`, and report error if no desired field or over one
* desired fields are found.
*
* TODO: this code is duplicated from Analyzer and should be refactored to avoid this.
*/
protected def resolveGetField(
def resolveGetField(
expr: Expression,
fieldName: String,
resolver: Resolver): Expression = {
Expand Down