to have resolved call the data type check function

Author: cloud-fan

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala

@@ -407,7 +407,7 @@ trait HiveTypeCoercion {
         Union(newLeft, newRight)
 
       // fix decimal precision for expressions
-      case q => q.transformExpressionsUp {
+      case q => q.transformExpressions {
         // Skip nodes whose children have not been resolved yet
         case e if !e.childrenResolved => e
 
@@ -619,12 +619,13 @@ trait HiveTypeCoercion {
    */
   object Division extends Rule[LogicalPlan] {
     def apply(plan: LogicalPlan): LogicalPlan = plan transformAllExpressions {
-      // Skip nodes who's children have not been resolved yet or input types do not match.
-      case e if !e.childrenResolved || e.checkInputDataTypes().hasError => e
+      // Skip Divisions who has not been resolved yet,
+      // as this is an extra rule which should be applied at last.
+      case e if !e.resolved => e
 
       // Decimal and Double remain the same
-      case d: Divide if d.resolved && d.dataType == DoubleType => d
-      case d: Divide if d.resolved && d.dataType.isInstanceOf[DecimalType] => d
+      case d: Divide if d.dataType == DoubleType => d
+      case d: Divide if d.dataType.isInstanceOf[DecimalType] => d
 
       case Divide(l, r) => Divide(Cast(l, DoubleType), Cast(r, DoubleType))
     }

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala

@@ -49,7 +49,7 @@ abstract class Expression extends TreeNode[Expression] {
    * should override this if the resolution of this type of expression involves more than just
    * the resolution of its children.
    */
-  lazy val resolved: Boolean = childrenResolved
+  lazy val resolved: Boolean = childrenResolved && !checkInputDataTypes().hasError
 
   /**
    * Returns the [[DataType]] of the result of evaluating this expression.  It is

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala

@@ -121,10 +121,6 @@ abstract class BinaryArithmetic extends BinaryExpression {
 case class Add(left: Expression, right: Expression) extends BinaryArithmetic {
   override def symbol: String = "+"
 
-  // We will always cast fixed decimal to unlimited decimal
-  // for `Add` in `HiveTypeCoercion`
-  override lazy val resolved = childrenResolved && !DecimalType.isFixed(dataType)
-
   protected def checkTypesInternal(t: DataType) =
     TypeUtils.checkForNumericExpr(t, "operator " + symbol)
 
@@ -136,10 +132,6 @@ case class Add(left: Expression, right: Expression) extends BinaryArithmetic {
 case class Subtract(left: Expression, right: Expression) extends BinaryArithmetic {
   override def symbol: String = "-"
 
-  // We will always cast fixed decimal to unlimited decimal
-  // for `Subtract` in `HiveTypeCoercion`
-  override lazy val resolved = childrenResolved && !DecimalType.isFixed(dataType)
-
   protected def checkTypesInternal(t: DataType) =
     TypeUtils.checkForNumericExpr(t, "operator " + symbol)
 
@@ -151,10 +143,6 @@ case class Subtract(left: Expression, right: Expression) extends BinaryArithmeti
 case class Multiply(left: Expression, right: Expression) extends BinaryArithmetic {
   override def symbol: String = "*"
 
-  // We will always cast fixed decimal to unlimited decimal
-  // for `Multiply` in `HiveTypeCoercion`
-  override lazy val resolved = childrenResolved && !DecimalType.isFixed(dataType)
-
   protected def checkTypesInternal(t: DataType) =
     TypeUtils.checkForNumericExpr(t, "operator " + symbol)
 
@@ -167,10 +155,6 @@ case class Divide(left: Expression, right: Expression) extends BinaryArithmetic
   override def symbol: String = "/"
   override def nullable: Boolean = true
 
-  // We will always cast fixed decimal to unlimited decimal
-  // for `Divide` in `HiveTypeCoercion`
-  override lazy val resolved = childrenResolved && !DecimalType.isFixed(dataType)
-
   protected def checkTypesInternal(t: DataType) =
     TypeUtils.checkForNumericExpr(t, "operator " + symbol)
 
@@ -198,10 +182,6 @@ case class Remainder(left: Expression, right: Expression) extends BinaryArithmet
   override def symbol: String = "%"
   override def nullable: Boolean = true
 
-  // We will always cast fixed decimal to unlimited decimal
-  // for `Remainder` in `HiveTypeCoercion`
-  override lazy val resolved = childrenResolved && !DecimalType.isFixed(dataType)
-
   protected def checkTypesInternal(t: DataType) =
     TypeUtils.checkForNumericExpr(t, "operator " + symbol)
 

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionTypeCheckingSuite.scala

@@ -19,10 +19,11 @@ package org.apache.spark.sql.catalyst.expressions
 
 import org.apache.spark.sql.AnalysisException
 import org.apache.spark.sql.catalyst.analysis.SimpleAnalyzer
-import org.apache.spark.sql.catalyst.plans.logical.LocalRelation
-import org.apache.spark.sql.catalyst.dsl.plans._
 import org.apache.spark.sql.catalyst.dsl.expressions._
-import org.apache.spark.sql.types.{BooleanType, StringType}
+import org.apache.spark.sql.catalyst.dsl.plans._
+import org.apache.spark.sql.catalyst.plans.logical.LocalRelation
+import org.apache.spark.sql.types.StringType
+
 import org.scalatest.FunSuite