diff options
author | Denny <dennybritz@gmail.com> | 2012-07-23 10:36:30 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-07-23 16:32:20 -0700 |
commit | 4f4a34c02542bf3b1da71117a777e76441b89acf (patch) | |
tree | 34356aa1b46d9ce003cd2d76f01e369cbb77cac4 /core/src | |
parent | 866e6949df8cdba0a4da20a1045333e419ed0e12 (diff) | |
download | spark-4f4a34c02542bf3b1da71117a777e76441b89acf.tar.gz spark-4f4a34c02542bf3b1da71117a777e76441b89acf.tar.bz2 spark-4f4a34c02542bf3b1da71117a777e76441b89acf.zip |
Stlystic changes
Conflicts:
core/src/test/scala/spark/MesosSchedulerSuite.scala
Diffstat (limited to 'core/src')
-rw-r--r-- | core/src/main/scala/spark/broadcast/Broadcast.scala | 2 | ||||
-rw-r--r-- | core/src/test/scala/spark/BroadcastSuite.scala | 4 | ||||
-rw-r--r-- | core/src/test/scala/spark/FailureSuite.scala | 4 | ||||
-rw-r--r-- | core/src/test/scala/spark/FileSuite.scala | 6 | ||||
-rw-r--r-- | core/src/test/scala/spark/PartitioningSuite.scala | 4 | ||||
-rw-r--r-- | core/src/test/scala/spark/PipedRDDSuite.scala | 4 | ||||
-rw-r--r-- | core/src/test/scala/spark/RDDSuite.scala | 6 | ||||
-rw-r--r-- | core/src/test/scala/spark/ShuffleSuite.scala | 4 | ||||
-rw-r--r-- | core/src/test/scala/spark/SortingSuite.scala | 4 | ||||
-rw-r--r-- | core/src/test/scala/spark/ThreadingSuite.scala | 4 |
10 files changed, 21 insertions, 21 deletions
diff --git a/core/src/main/scala/spark/broadcast/Broadcast.scala b/core/src/main/scala/spark/broadcast/Broadcast.scala index 4c7ab5f8ec..eaa9153279 100644 --- a/core/src/main/scala/spark/broadcast/Broadcast.scala +++ b/core/src/main/scala/spark/broadcast/Broadcast.scala @@ -177,7 +177,7 @@ object Broadcast extends Logging with Serializable { } private def byteArrayToObject[OUT](bytes: Array[Byte]): OUT = { - val in = new ObjectInputStream (new ByteArrayInputStream (bytes)){ + val in = new ObjectInputStream (new ByteArrayInputStream (bytes)) { override def resolveClass(desc: ObjectStreamClass) = Class.forName(desc.getName, false, Thread.currentThread.getContextClassLoader) } diff --git a/core/src/test/scala/spark/BroadcastSuite.scala b/core/src/test/scala/spark/BroadcastSuite.scala index d22c2d4295..1e0b587421 100644 --- a/core/src/test/scala/spark/BroadcastSuite.scala +++ b/core/src/test/scala/spark/BroadcastSuite.scala @@ -7,8 +7,8 @@ class BroadcastSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/FailureSuite.scala b/core/src/test/scala/spark/FailureSuite.scala index 7ef90cf2f6..0aaa16dca4 100644 --- a/core/src/test/scala/spark/FailureSuite.scala +++ b/core/src/test/scala/spark/FailureSuite.scala @@ -27,8 +27,8 @@ class FailureSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/FileSuite.scala b/core/src/test/scala/spark/FileSuite.scala index 3a77ed0f13..4cb9c7802f 100644 --- a/core/src/test/scala/spark/FileSuite.scala +++ b/core/src/test/scala/spark/FileSuite.scala @@ -11,12 +11,12 @@ import org.apache.hadoop.io._ import SparkContext._ -class FileSuite extends FunSuite with BeforeAndAfter{ +class FileSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/PartitioningSuite.scala b/core/src/test/scala/spark/PartitioningSuite.scala index dfe6a295c8..cf2ffeb9b1 100644 --- a/core/src/test/scala/spark/PartitioningSuite.scala +++ b/core/src/test/scala/spark/PartitioningSuite.scala @@ -11,8 +11,8 @@ class PartitioningSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/PipedRDDSuite.scala b/core/src/test/scala/spark/PipedRDDSuite.scala index c0cf034c72..db1b9835a0 100644 --- a/core/src/test/scala/spark/PipedRDDSuite.scala +++ b/core/src/test/scala/spark/PipedRDDSuite.scala @@ -8,8 +8,8 @@ class PipedRDDSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/RDDSuite.scala b/core/src/test/scala/spark/RDDSuite.scala index 1d240b471f..3924a6890b 100644 --- a/core/src/test/scala/spark/RDDSuite.scala +++ b/core/src/test/scala/spark/RDDSuite.scala @@ -5,12 +5,12 @@ import org.scalatest.FunSuite import org.scalatest.BeforeAndAfter import SparkContext._ -class RDDSuite extends FunSuite with BeforeAndAfter{ +class RDDSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/ShuffleSuite.scala b/core/src/test/scala/spark/ShuffleSuite.scala index c45c5935de..5fa494160f 100644 --- a/core/src/test/scala/spark/ShuffleSuite.scala +++ b/core/src/test/scala/spark/ShuffleSuite.scala @@ -17,8 +17,8 @@ class ShuffleSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/SortingSuite.scala b/core/src/test/scala/spark/SortingSuite.scala index ced3c66d38..d2dd514edb 100644 --- a/core/src/test/scala/spark/SortingSuite.scala +++ b/core/src/test/scala/spark/SortingSuite.scala @@ -8,8 +8,8 @@ class SortingSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } diff --git a/core/src/test/scala/spark/ThreadingSuite.scala b/core/src/test/scala/spark/ThreadingSuite.scala index d617e8c15f..90409a54ec 100644 --- a/core/src/test/scala/spark/ThreadingSuite.scala +++ b/core/src/test/scala/spark/ThreadingSuite.scala @@ -26,8 +26,8 @@ class ThreadingSuite extends FunSuite with BeforeAndAfter { var sc: SparkContext = _ - after{ - if(sc != null){ + after { + if(sc != null) { sc.stop() } } |