Repository: spark
Updated Branches:
  refs/heads/branch-2.0 01520de6b -> 9e806f2a4


[SQL][STREAMING][TEST] Follow up to remove Option.contains for Scala 2.10 
compatibility

## What changes were proposed in this pull request?

Scala 2.10 does not have Option.contains, which broke Scala 2.10 build.

## How was this patch tested?
Locally compiled and ran sql/core unit tests in 2.10

Author: Tathagata Das <tathagata.das1...@gmail.com>

Closes #15531 from tdas/metrics-flaky-test-fix-1.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9e806f2a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9e806f2a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9e806f2a

Branch: refs/heads/branch-2.0
Commit: 9e806f2a4fbc0e7d1441a3eda375cba2fda8ffe5
Parents: 01520de
Author: Tathagata Das <tathagata.das1...@gmail.com>
Authored: Tue Oct 18 02:29:55 2016 -0700
Committer: Tathagata Das <tathagata.das1...@gmail.com>
Committed: Tue Oct 18 02:31:27 2016 -0700

----------------------------------------------------------------------
 .../test/scala/org/apache/spark/sql/streaming/StreamTest.scala   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/9e806f2a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamTest.scala
----------------------------------------------------------------------
diff --git 
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamTest.scala 
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamTest.scala
index 04e20c7..5aa363e 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamTest.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamTest.scala
@@ -211,7 +211,9 @@ trait StreamTest extends QueryTest with SharedSQLContext 
with Timeouts {
       }
     }
 
-    def isStreamWaitingAt(time: Long): Boolean = synchronized { 
waitStartTime.contains(time) }
+    def isStreamWaitingAt(time: Long): Boolean = synchronized {
+      waitStartTime == Some(time)
+    }
   }
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to