spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sro...@apache.org
Subject spark git commit: [SPARK-13423][HOTFIX] Static analysis fixes for 2.x / fixed for Scala 2.10, again
Date Thu, 03 Mar 2016 22:40:44 GMT
Repository: spark
Updated Branches:
  refs/heads/master ce58e99aa -> 52035d103


[SPARK-13423][HOTFIX] Static analysis fixes for 2.x / fixed for Scala 2.10, again

## What changes were proposed in this pull request?

Fixes (another) compile problem due to inadvertent use of Option.contains, only in Scala 2.11

## How was this patch tested?

Jenkins tests

Author: Sean Owen <sowen@cloudera.com>

Closes #11496 from srowen/SPARK-13423.3.


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

Branch: refs/heads/master
Commit: 52035d103661721a8f87c2f6788c6411f645a99d
Parents: ce58e99
Author: Sean Owen <sowen@cloudera.com>
Authored: Thu Mar 3 22:40:39 2016 +0000
Committer: Sean Owen <sowen@cloudera.com>
Committed: Thu Mar 3 22:40:39 2016 +0000

----------------------------------------------------------------------
 .../scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/52035d10/core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala
index 935e280..b5385c1 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/TaskResultGetterSuite.scala
@@ -243,7 +243,7 @@ class TaskResultGetterSuite extends SparkFunSuite with BeforeAndAfter
with Local
     val resAfter = captor.getValue
     val resSizeBefore = resBefore.accumUpdates.find(_.name == Some(RESULT_SIZE)).flatMap(_.update)
     val resSizeAfter = resAfter.accumUpdates.find(_.name == Some(RESULT_SIZE)).flatMap(_.update)
-    assert(resSizeBefore.contains(0L))
+    assert(resSizeBefore.exists(_ == 0L))
     assert(resSizeAfter.exists(_.toString.toLong > 0L))
   }
 


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


Mime
View raw message