aboutsummaryrefslogtreecommitdiff
path: root/sql/core/src/test
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2016-09-23 12:17:59 -0700
committerTathagata Das <tathagata.das1565@gmail.com>2016-09-23 12:17:59 -0700
commit988c71457354b0a443471f501cef544a85b1a76a (patch)
treef2189ea63e2ee41bd26ff4e0cb3bdcc5b0c22f29 /sql/core/src/test
parentf62ddc5983a08d4d54c0a9a8210dd6cbec555671 (diff)
downloadspark-988c71457354b0a443471f501cef544a85b1a76a.tar.gz
spark-988c71457354b0a443471f501cef544a85b1a76a.tar.bz2
spark-988c71457354b0a443471f501cef544a85b1a76a.zip
[SPARK-17643] Remove comparable requirement from Offset
For some sources, it is difficult to provide a global ordering based only on the data in the offset. Since we don't use comparison for correctness, lets remove it. Author: Michael Armbrust <michael@databricks.com> Closes #15207 from marmbrus/removeComparable.
Diffstat (limited to 'sql/core/src/test')
-rw-r--r--sql/core/src/test/scala/org/apache/spark/sql/streaming/OffsetSuite.scala39
1 files changed, 0 insertions, 39 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/streaming/OffsetSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/streaming/OffsetSuite.scala
index 9590af4e77..b65a987770 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/streaming/OffsetSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/streaming/OffsetSuite.scala
@@ -24,44 +24,12 @@ trait OffsetSuite extends SparkFunSuite {
/** Creates test to check all the comparisons of offsets given a `one` that is less than `two`. */
def compare(one: Offset, two: Offset): Unit = {
test(s"comparison $one <=> $two") {
- assert(one < two)
- assert(one <= two)
- assert(one <= one)
- assert(two > one)
- assert(two >= one)
- assert(one >= one)
assert(one == one)
assert(two == two)
assert(one != two)
assert(two != one)
}
}
-
- /** Creates test to check that non-equality comparisons throw exception. */
- def compareInvalid(one: Offset, two: Offset): Unit = {
- test(s"invalid comparison $one <=> $two") {
- intercept[IllegalArgumentException] {
- assert(one < two)
- }
-
- intercept[IllegalArgumentException] {
- assert(one <= two)
- }
-
- intercept[IllegalArgumentException] {
- assert(one > two)
- }
-
- intercept[IllegalArgumentException] {
- assert(one >= two)
- }
-
- assert(!(one == two))
- assert(!(two == one))
- assert(one != two)
- assert(two != one)
- }
- }
}
class LongOffsetSuite extends OffsetSuite {
@@ -79,10 +47,6 @@ class CompositeOffsetSuite extends OffsetSuite {
one = CompositeOffset(None :: Nil),
two = CompositeOffset(Some(LongOffset(2)) :: Nil))
- compareInvalid( // sizes must be same
- one = CompositeOffset(Nil),
- two = CompositeOffset(Some(LongOffset(2)) :: Nil))
-
compare(
one = CompositeOffset.fill(LongOffset(0), LongOffset(1)),
two = CompositeOffset.fill(LongOffset(1), LongOffset(2)))
@@ -91,8 +55,5 @@ class CompositeOffsetSuite extends OffsetSuite {
one = CompositeOffset.fill(LongOffset(1), LongOffset(1)),
two = CompositeOffset.fill(LongOffset(1), LongOffset(2)))
- compareInvalid(
- one = CompositeOffset.fill(LongOffset(2), LongOffset(1)), // vector time inconsistent
- two = CompositeOffset.fill(LongOffset(1), LongOffset(2)))
}