style

apache · Aug 19, 2015 · 06c8ffa · 06c8ffa
1 parent 9d56e1b
commit 06c8ffa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/core/src/main/scala/org/apache/spark/storage/ExternalBlockStore.scala b/core/src/main/scala/org/apache/spark/storage/ExternalBlockStore.scala
@@ -48,7 +48,10 @@ private[spark] class ExternalBlockStore(blockManager: BlockManager, executorId:
     }
   }
 
-  override def putBytes(blockId: BlockId, bytes: LargeByteBuffer, level: StorageLevel): PutResult = {
+  override def putBytes(
+      blockId: BlockId,
+      bytes: LargeByteBuffer,
+      level: StorageLevel): PutResult = {
     putIntoExternalBlockStore(blockId, bytes, returnValues = true)
   }
 

diff --git a/core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala
@@ -137,7 +137,7 @@ private[spark] class TachyonBlockManager() extends ExternalBlockManager with Log
     val is = file.getInStream(ReadType.CACHE)
     try {
       val size = file.length
-      //TODO get tachyon to support large blocks
+      // TODO get tachyon to support large blocks
       val bs = new Array[Byte](size.asInstanceOf[Int])
       ByteStreams.readFully(is, bs)
       Some(LargeByteBufferHelper.asLargeByteBuffer(bs))

diff --git a/core/src/test/scala/org/apache/spark/ShuffleSuite.scala b/core/src/test/scala/org/apache/spark/ShuffleSuite.scala
@@ -288,7 +288,7 @@ abstract class ShuffleSuite extends SparkFunSuite with Matchers with LocalSparkC
     val rdd = sc.parallelize(1 to 1e6.toInt, 1).map{ i =>
       val n = 3e3.toInt
       val arr = new Array[Byte](n)
-      //need to make sure the array doesn't compress to something small
+      // need to make sure the array doesn't compress to something small
       scala.util.Random.nextBytes(arr)
       (i, arr)
     }
@@ -304,7 +304,7 @@ abstract class ShuffleSuite extends SparkFunSuite with Matchers with LocalSparkC
     val rdd = sc.parallelize(1 to 1e6.toInt, 1).map{ i =>
       val n = 3e3.toInt
       val arr = new Array[Byte](n)
-      //need to make sure the array doesn't compress to something small
+      // need to make sure the array doesn't compress to something small
       scala.util.Random.nextBytes(arr)
       (2 * i, arr)
     }

diff --git a/core/src/test/scala/org/apache/spark/rdd/LargePartitionCachingSuite.scala b/core/src/test/scala/org/apache/spark/rdd/LargePartitionCachingSuite.scala
@@ -18,13 +18,15 @@ package org.apache.spark.rdd
 
 import org.apache.spark._
 import org.apache.spark.storage.{ReplicationBlockSizeLimitException, StorageLevel}
-import org.scalatest.{Matchers, FunSuite}
+import org.scalatest.Matchers
 
-class LargePartitionCachingSuite extends FunSuite with SharedSparkContext with Matchers {
+class LargePartitionCachingSuite extends SparkFunSuite with SharedSparkContext with Matchers {
 
-  def largePartitionRdd = sc.parallelize(1 to 1e6.toInt, 1).map{i => new Array[Byte](2.2e3.toInt)}
+  def largePartitionRdd: RDD[Array[Byte]] = {
+    sc.parallelize(1 to 1e6.toInt, 1).map{i => new Array[Byte](2.2e3.toInt)}
+  }
 
-  //just don't want to kill the test server
+  // just don't want to kill the test server
   ignore("memory serialized cache large partitions") {
     largePartitionRdd.persist(StorageLevel.MEMORY_ONLY_SER).count() should be (1e6.toInt)
   }