fix hive tests

apache · Jun 1, 2015 · c71d02c · c71d02c
1 parent 6491721
commit c71d02c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCheckResult.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCheckResult.scala
@@ -27,4 +27,4 @@ class TypeCheckResult(val errorMessage: String) extends AnyVal {
 object TypeCheckResult {
   val success: TypeCheckResult = new TypeCheckResult(null)
   def fail(msg: String): TypeCheckResult = new TypeCheckResult(msg)
-}
+}
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
@@ -172,17 +172,6 @@ case class Or(left: Expression, right: Expression)
 abstract class BinaryComparison extends BinaryExpression with Predicate {
   self: Product =>
 
-  override def checkInputDataTypes: TypeCheckResult = {
-    if (left.dataType != right.dataType) {
-      TypeCheckResult.fail(
-        s"differing types in BinaryComparisons -- ${left.dataType}, ${right.dataType}")
-    } else {
-      checkTypesInternal(left.dataType)
-    }
-  }
-
-  protected def checkTypesInternal(t: DataType): TypeCheckResult = TypeCheckResult.success
-
   override def eval(input: Row): Any = {
     val evalE1 = left.eval(input)
     if(evalE1 == null) {
@@ -231,8 +220,10 @@ case class EqualNullSafe(left: Expression, right: Expression) extends BinaryComp
 case class LessThan(left: Expression, right: Expression) extends BinaryComparison {
   override def symbol: String = "<"
 
-  override protected def checkTypesInternal(t: DataType) = {
-    if (TypeUtils.validForOrderingExpr(t)) {
+  override def checkInputDataTypes: TypeCheckResult = {
+    if (left.dataType != right.dataType) {
+      TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
+    } else if (TypeUtils.validForOrderingExpr(left.dataType)) {
       TypeCheckResult.success
     } else {
       TypeCheckResult.fail("todo")
@@ -247,8 +238,10 @@ case class LessThan(left: Expression, right: Expression) extends BinaryCompariso
 case class LessThanOrEqual(left: Expression, right: Expression) extends BinaryComparison {
   override def symbol: String = "<="
 
-  override protected def checkTypesInternal(t: DataType) = {
-    if (TypeUtils.validForOrderingExpr(t)) {
+  override def checkInputDataTypes: TypeCheckResult = {
+    if (left.dataType != right.dataType) {
+      TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
+    } else if (TypeUtils.validForOrderingExpr(left.dataType)) {
       TypeCheckResult.success
     } else {
       TypeCheckResult.fail("todo")
@@ -263,8 +256,10 @@ case class LessThanOrEqual(left: Expression, right: Expression) extends BinaryCo
 case class GreaterThan(left: Expression, right: Expression) extends BinaryComparison {
   override def symbol: String = ">"
 
-  override protected def checkTypesInternal(t: DataType) = {
-    if (TypeUtils.validForOrderingExpr(t)) {
+  override def checkInputDataTypes: TypeCheckResult = {
+    if (left.dataType != right.dataType) {
+      TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
+    } else if (TypeUtils.validForOrderingExpr(left.dataType)) {
       TypeCheckResult.success
     } else {
       TypeCheckResult.fail("todo")
@@ -279,8 +274,10 @@ case class GreaterThan(left: Expression, right: Expression) extends BinaryCompar
 case class GreaterThanOrEqual(left: Expression, right: Expression) extends BinaryComparison {
   override def symbol: String = ">="
 
-  override protected def checkTypesInternal(t: DataType) = {
-    if (TypeUtils.validForOrderingExpr(t)) {
+  override def checkInputDataTypes: TypeCheckResult = {
+    if (left.dataType != right.dataType) {
+      TypeCheckResult.fail("types do not match -- ${left.dataType} != ${right.dataType}")
+    } else if (TypeUtils.validForOrderingExpr(left.dataType)) {
       TypeCheckResult.success
     } else {
       TypeCheckResult.fail("todo")