Skip to content

[SPARK-8371][SQL] improve unit test for MaxOf and MinOf and fix bugs #6825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-8371][SQL] improve unit test for MaxOf and MinOf and fix bugs #6825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,10 @@ class CodeGenContext {
* Generate code for compare expression in Java
*/
def genComp(dataType: DataType, c1: String, c2: String): String = dataType match {
// java boolean doesn't support > or < operator
case BooleanType => s"($c1 == $c2 ? 0 : ($c1 ? 1 : -1))"
Copy link
Contributor

@davies davies Jun 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

// use c1 - c2 may overflow
case dt: DataType if isPrimitiveType(dt) => s"(int)($c1 > $c2 ? 1 : $c1 < $c2 ? -1 : 0)"
case dt: DataType if isPrimitiveType(dt) => s"($c1 > $c2 ? 1 : $c1 < $c2 ? -1 : 0)"
case BinaryType => s"org.apache.spark.sql.catalyst.util.TypeUtils.compareBinary($c1, $c2)"
case other => s"$c1.compare($c2)"
}
Expand Down
46 changes: 31 additions & 15 deletions .../src/test/scala/org/apache/spark/sql/catalyst/expressions/ArithmeticExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.sql.catalyst.expressions

import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.types.{Decimal, DoubleType, IntegerType}
import org.apache.spark.sql.types.Decimal


class ArithmeticExpressionSuite extends SparkFunSuite with ExpressionEvalHelper {
Expand Down Expand Up @@ -123,23 +123,39 @@ class ArithmeticExpressionSuite extends SparkFunSuite with ExpressionEvalHelper
}
}

test("MaxOf") {
checkEvaluation(MaxOf(1, 2), 2)
checkEvaluation(MaxOf(2, 1), 2)
checkEvaluation(MaxOf(1L, 2L), 2L)
checkEvaluation(MaxOf(2L, 1L), 2L)
test("MaxOf basic") {
testNumericDataTypes { convert =>
val small = Literal(convert(1))
val large = Literal(convert(2))
checkEvaluation(MaxOf(small, large), convert(2))
checkEvaluation(MaxOf(large, small), convert(2))
checkEvaluation(MaxOf(Literal.create(null, small.dataType), large), convert(2))
checkEvaluation(MaxOf(large, Literal.create(null, small.dataType)), convert(2))
}
}

checkEvaluation(MaxOf(Literal.create(null, IntegerType), 2), 2)
checkEvaluation(MaxOf(2, Literal.create(null, IntegerType)), 2)
test("MaxOf for atomic type") {
checkEvaluation(MaxOf(true, false), true)
checkEvaluation(MaxOf("abc", "bcd"), "bcd")
checkEvaluation(MaxOf(Array(1.toByte, 2.toByte), Array(1.toByte, 3.toByte)),
Array(1.toByte, 3.toByte))
}

test("MinOf") {
checkEvaluation(MinOf(1, 2), 1)
checkEvaluation(MinOf(2, 1), 1)
checkEvaluation(MinOf(1L, 2L), 1L)
checkEvaluation(MinOf(2L, 1L), 1L)
test("MinOf basic") {
testNumericDataTypes { convert =>
val small = Literal(convert(1))
val large = Literal(convert(2))
checkEvaluation(MinOf(small, large), convert(1))
checkEvaluation(MinOf(large, small), convert(1))
checkEvaluation(MinOf(Literal.create(null, small.dataType), large), convert(2))
checkEvaluation(MinOf(small, Literal.create(null, small.dataType)), convert(1))
}
}

checkEvaluation(MinOf(Literal.create(null, IntegerType), 1), 1)
checkEvaluation(MinOf(1, Literal.create(null, IntegerType)), 1)
test("MinOf for atomic type") {
checkEvaluation(MinOf(true, false), false)
checkEvaluation(MinOf("abc", "bcd"), "abc")
checkEvaluation(MinOf(Array(1.toByte, 2.toByte), Array(1.toByte, 3.toByte)),
Array(1.toByte, 2.toByte))
}
}