diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-01 14:07:34 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-01 14:07:34 -0800 |
| commit | 9970926ede0d5a719b8f22e97977804d3c811e97 (patch) | |
| tree | 0a5b796cda13bcb1ae33d6f90832bd8a759e40e8 /core | |
| parent | de340ddf0bdad999f3cfaa25e3ae561ecfec357b (diff) | |
| download | spark-9970926ede0d5a719b8f22e97977804d3c811e97.tar.gz spark-9970926ede0d5a719b8f22e97977804d3c811e97.tar.bz2 spark-9970926ede0d5a719b8f22e97977804d3c811e97.zip | |
formatting
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/RDD.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/scheduler/ShuffleMapTask.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/RDD.scala b/core/src/main/scala/spark/RDD.scala index 210404d540..010e61dfdc 100644 --- a/core/src/main/scala/spark/RDD.scala +++ b/core/src/main/scala/spark/RDD.scala @@ -385,7 +385,7 @@ abstract class RDD[T: ClassManifest]( val reducePartition: Iterator[T] => Option[T] = iter => { if (iter.hasNext) { Some(iter.reduceLeft(cleanF)) - }else { + } else { None } } diff --git a/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala b/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala index 83641a2a84..20f2c9e489 100644 --- a/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala +++ b/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala @@ -32,7 +32,7 @@ private[spark] object ShuffleMapTask { return old } else { val out = new ByteArrayOutputStream - val ser = SparkEnv.get.closureSerializer.newInstance + val ser = SparkEnv.get.closureSerializer.newInstance() val objOut = ser.serializeStream(new GZIPOutputStream(out)) objOut.writeObject(rdd) objOut.writeObject(dep) @@ -48,7 +48,7 @@ private[spark] object ShuffleMapTask { synchronized { val loader = Thread.currentThread.getContextClassLoader val in = new GZIPInputStream(new ByteArrayInputStream(bytes)) - val ser = SparkEnv.get.closureSerializer.newInstance + val ser = SparkEnv.get.closureSerializer.newInstance() val objIn = ser.deserializeStream(in) val rdd = objIn.readObject().asInstanceOf[RDD[_]] val dep = objIn.readObject().asInstanceOf[ShuffleDependency[_,_]] |