Github user pwendell commented on a diff in the pull request:
https://github.com/apache/spark/pull/1058#discussion_r13712333
--- Diff: core/src/main/scala/org/apache/spark/storage/BlockManager.scala
---
@@ -28,46 +28,48 @@ import scala.util.Random
import akka.actor.{ActorSystem, Cancellable, Props}
import sun.nio.ch.DirectBuffer
-import org.apache.spark.{Logging, MapOutputTracker, SecurityManager,
SparkConf, SparkEnv, SparkException}
+import org.apache.spark._
import org.apache.spark.io.CompressionCodec
import org.apache.spark.network._
import org.apache.spark.serializer.Serializer
import org.apache.spark.util._
-private[spark] sealed trait Values
-
-private[spark] case class ByteBufferValues(buffer: ByteBuffer) extends
Values
-private[spark] case class IteratorValues(iterator: Iterator[Any]) extends
Values
-private[spark] case class ArrayBufferValues(buffer: ArrayBuffer[Any])
extends Values
+private[spark] sealed trait BlockValues
+private[spark] case class ByteBufferValues(buffer: ByteBuffer) extends
BlockValues
+private[spark] case class IteratorValues(iterator: Iterator[Any]) extends
BlockValues
+private[spark] case class ArrayBufferValues(buffer: ArrayBuffer[Any])
extends BlockValues
private[spark] class BlockManager(
executorId: String,
actorSystem: ActorSystem,
val master: BlockManagerMaster,
- val defaultSerializer: Serializer,
+ defaultSerializer: Serializer,
maxMemory: Long,
- val _conf: SparkConf,
+ val conf: SparkConf,
securityManager: SecurityManager,
mapOutputTracker: MapOutputTracker)
extends Logging {
- def conf = _conf
val shuffleBlockManager = new ShuffleBlockManager(this)
val diskBlockManager = new DiskBlockManager(shuffleBlockManager,
- conf.get("spark.local.dir", System.getProperty("java.io.tmpdir")))
+ conf.get("spark.local.dir", System.getProperty("java.io.tmpdir")))
+ val connectionManager = new ConnectionManager(0, conf, securityManager)
--- End diff --
Is this moved for initialization order reasons or just to better group the
various vals in this function?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
