aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenchen Fan <cloud0fan@outlook.com>2015-04-21 14:48:02 -0700
committerMichael Armbrust <michael@databricks.com>2015-04-21 14:48:02 -0700
commit03fd92167107f1d061c1a7ef216468b508546ac7 (patch)
tree86cf322fec59803468ff4f0b1da1ace8065a8b64
parent2e8c6ca47df14681c1110f0736234ce76a3eca9b (diff)
downloadspark-03fd92167107f1d061c1a7ef216468b508546ac7.tar.gz
spark-03fd92167107f1d061c1a7ef216468b508546ac7.tar.bz2
spark-03fd92167107f1d061c1a7ef216468b508546ac7.zip
[SQL][minor] make it more clear that we only need to re-throw GetField exception for UnresolvedAttribute
For `GetField` outside `UnresolvedAttribute`, we will throw exception in `Analyzer`. Author: Wenchen Fan <cloud0fan@outlook.com> Closes #5588 from cloud-fan/tmp and squashes the following commits: 7ac74d2 [Wenchen Fan] small refactor
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala9
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
index 1155dac28f..a986dd5387 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
@@ -46,12 +46,11 @@ trait CheckAnalysis {
operator transformExpressionsUp {
case a: Attribute if !a.resolved =>
if (operator.childrenResolved) {
- val nameParts = a match {
- case UnresolvedAttribute(nameParts) => nameParts
- case _ => Seq(a.name)
+ a match {
+ case UnresolvedAttribute(nameParts) =>
+ // Throw errors for specific problems with get field.
+ operator.resolveChildren(nameParts, resolver, throwErrors = true)
}
- // Throw errors for specific problems with get field.
- operator.resolveChildren(nameParts, resolver, throwErrors = true)
}
val from = operator.inputSet.map(_.name).mkString(", ")