Github user marmbrus commented on a diff in the pull request:
https://github.com/apache/spark/pull/7143#discussion_r33799817
--- Diff:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/PredicateSuite.scala
---
@@ -137,43 +132,78 @@ class PredicateSuite extends SparkFunSuite with
ExpressionEvalHelper {
checkEvaluation(And(InSet(one, hS), InSet(two, hS)), true)
}
+ private val smallValues = Seq(1, Decimal(1), Array(1.toByte),
"a").map(Literal(_))
+ private val largeValues = Seq(2, Decimal(2), Array(2.toByte),
"b").map(Literal(_))
- test("BinaryComparison") {
- val row = create_row(1, 2, 3, null, 3, null)
- val c1 = 'a.int.at(0)
- val c2 = 'a.int.at(1)
- val c3 = 'a.int.at(2)
- val c4 = 'a.int.at(3)
- val c5 = 'a.int.at(4)
- val c6 = 'a.int.at(5)
+ private val equalValues1 = smallValues
+ private val equalValues2 = Seq(1, Decimal(1), Array(1.toByte),
"a").map(Literal(_))
- checkEvaluation(LessThan(c1, c4), null, row)
- checkEvaluation(LessThan(c1, c2), true, row)
- checkEvaluation(LessThan(c1, Literal.create(null, IntegerType)), null,
row)
- checkEvaluation(LessThan(Literal.create(null, IntegerType), c2), null,
row)
- checkEvaluation(
- LessThan(Literal.create(null, IntegerType), Literal.create(null,
IntegerType)), null, row)
-
- checkEvaluation(c1 < c2, true, row)
- checkEvaluation(c1 <= c2, true, row)
- checkEvaluation(c1 > c2, false, row)
- checkEvaluation(c1 >= c2, false, row)
- checkEvaluation(c1 === c2, false, row)
- checkEvaluation(c1 !== c2, true, row)
- checkEvaluation(c4 <=> c1, false, row)
- checkEvaluation(c1 <=> c4, false, row)
- checkEvaluation(c4 <=> c6, true, row)
- checkEvaluation(c3 <=> c5, true, row)
- checkEvaluation(Literal(true) <=> Literal.create(null, BooleanType),
false, row)
- checkEvaluation(Literal.create(null, BooleanType) <=> Literal(true),
false, row)
-
- val d1 = DateTimeUtils.fromJavaDate(Date.valueOf("1970-01-01"))
- val d2 = DateTimeUtils.fromJavaDate(Date.valueOf("1970-01-02"))
- checkEvaluation(Literal(d1) < Literal(d2), true)
-
- val ts1 = new Timestamp(12)
- val ts2 = new Timestamp(123)
- checkEvaluation(Literal("ab") < Literal("abc"), true)
- checkEvaluation(Literal(ts1) < Literal(ts2), true)
+ test("BinaryComparison: <") {
+ for (i <- 0 until smallValues.length) {
+ checkEvaluation(smallValues(i) < largeValues(i), true)
+ checkEvaluation(equalValues1(i) < equalValues2(i), false)
+ checkEvaluation(largeValues(i) < smallValues(i), false)
+ }
+ }
+
+ test("BinaryComparison: <=") {
+ for (i <- 0 until smallValues.length) {
+ checkEvaluation(smallValues(i) <= largeValues(i), true)
+ checkEvaluation(equalValues1(i) <= equalValues2(i), true)
+ checkEvaluation(largeValues(i) <= smallValues(i), false)
+ }
+ }
+
+ test("BinaryComparison: >") {
+ for (i <- 0 until smallValues.length) {
+ checkEvaluation(smallValues(i) > largeValues(i), false)
+ checkEvaluation(equalValues1(i) > equalValues2(i), false)
+ checkEvaluation(largeValues(i) > smallValues(i), true)
+ }
+ }
+
+ test("BinaryComparison: >=") {
+ for (i <- 0 until smallValues.length) {
+ checkEvaluation(smallValues(i) >= largeValues(i), false)
+ checkEvaluation(equalValues1(i) >= equalValues2(i), true)
+ checkEvaluation(largeValues(i) >= smallValues(i), true)
+ }
+ }
+
+ test("BinaryComparison: ===") {
+ for (i <- 0 until smallValues.length) {
+ checkEvaluation(smallValues(i) === largeValues(i), false)
+ checkEvaluation(equalValues1(i) === equalValues2(i), true)
+ checkEvaluation(largeValues(i) === smallValues(i), false)
+ }
+ }
+
+ test("BinaryComparison: <=>") {
+ for (i <- 0 until smallValues.length) {
+ checkEvaluation(smallValues(i) <=> largeValues(i), false)
+ checkEvaluation(equalValues1(i) <=> equalValues2(i), true)
+ checkEvaluation(largeValues(i) <=> smallValues(i), false)
+ }
--- End diff --
This is much clearer :)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
