using AnalysisException

apache · Feb 11, 2015 · db86dc4 · db86dc4
1 parent f6b0d71
commit db86dc4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -84,9 +84,8 @@ class Analyzer(catalog: Catalog,
     def apply(plan: LogicalPlan): LogicalPlan = plan.transform {
       case q: LogicalPlan =>
         q transformExpressions {
-          case cast @ Cast(child, dataType) if cast.childrenResolved && !cast.resolved =>
-            throw new TreeNodeException(q,
-              s"can not cast from ${child.dataType} to $dataType!")
+          case cast @ Cast(child, dataType) if !cast.resolve(child.dataType, dataType) =>
+            throw new AnalysisException(s"can not cast from ${child.dataType} to $dataType!")
           case p => p
         }
     }

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
@@ -51,7 +51,7 @@ case class Cast(child: Expression, dataType: DataType) extends UnaryExpression w
 
   private[this] def resolvableNullability(from: Boolean, to: Boolean) = !from || to
 
-  private[this] def resolve(from: DataType, to: DataType): Boolean = {
+  private[sql] def resolve(from: DataType, to: DataType): Boolean = {
     (from, to) match {
       case (from, to) if from == to         => true
 

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala
@@ -27,9 +27,7 @@ import scala.util.Try
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars
 
 import org.apache.spark.{SparkFiles, SparkException}
-import org.apache.spark.sql.catalyst.errors.TreeNodeException
-import org.apache.spark.sql.catalyst.expressions.Cast
-import org.apache.spark.sql.{DataFrame, Row}
+import org.apache.spark.sql.{AnalysisException, DataFrame, Row}
 import org.apache.spark.sql.catalyst.plans.logical.Project
 import org.apache.spark.sql.Dsl._
 import org.apache.spark.sql.hive._
@@ -69,7 +67,7 @@ class HiveQuerySuite extends HiveComparisonTest with BeforeAndAfter {
   }
 
   test("SPARK-5649: added a rule to check datatypes cast") {
-    intercept[TreeNodeException[Cast]] {
+    intercept[AnalysisException] {
       sql("select cast(key as binary) from src").collect()
     }
   }