Refacoring...

core/src/main/scala/spark/broadcast/Broadcast.scala

@@ -19,11 +19,6 @@ trait Broadcast[T] {
   override def toString = "spark.Broadcast(" + uuid + ")"
 }
 
-trait BroadcastFactory {
-  def initialize (isMaster: Boolean): Unit
-  def newBroadcast[T] (value_ : T, isLocal: Boolean): Broadcast[T]
-}
-
 object Broadcast
 extends Logging {
   // Messages
@@ -219,34 +214,6 @@ extends Logging {
   }  
 }
 
-// CHANGED: Keep track of the blockSize for THIS broadcast variable.
-// Broadcast.BlockSize is expected to be updated across different broadcasts
-@serializable
-case class SourceInfo (val hostAddress: String,
-                       val listenPort: Int,
-                       val totalBlocks: Int = SourceInfo.UnusedParam,
-                       val totalBytes: Int = SourceInfo.UnusedParam,
-                       val blockSize: Int = Broadcast.BlockSize)
-extends Comparable[SourceInfo] with Logging {
-  var currentLeechers = 0
-  var receptionFailed = false
-
-  var hasBlocks = 0
-  var hasBlocksBitVector: BitSet = new BitSet (totalBlocks)
-
-  // Ascending sort based on leecher count
-  def compareTo (o: SourceInfo): Int = (currentLeechers - o.currentLeechers)
-}
-
-object SourceInfo {
-  // Constants for special values of listenPort
-  val TxNotStartedRetry = -1
-  val TxOverGoToHDFS = 0
-  // Other constants
-  val StopBroadcast = -2
-  val UnusedParam = 0
-}
-
 @serializable
 case class BroadcastBlock (val blockID: Int, val byteArray: Array[Byte]) { }
 

core/src/main/scala/spark/broadcast/BroadcastFactory.scala

@@ -0,0 +1,12 @@
+package spark.broadcast
+
+/**
+ * An interface for all the broadcast implementations in Spark (to allow 
+ * multiple broadcast implementations). SparkContext uses a user-specified
+ * BroadcastFactory implementation to instantiate a particular broadcast for the
+ * entire Spark job.
+ */
+trait BroadcastFactory {
+  def initialize (isMaster: Boolean): Unit
+  def newBroadcast[T] (value_ : T, isLocal: Boolean): Broadcast[T]
+}

core/src/main/scala/spark/broadcast/SourceInfo.scala

@@ -0,0 +1,41 @@
+package spark.broadcast
+
+import java.util.BitSet
+
+import spark._
+
+/**
+ * Used to keep and pass around information of peers involved in a broadcast
+ * 
+ * CHANGED: Keep track of the blockSize for THIS broadcast variable.
+ * Broadcast.BlockSize is expected to be updated across different broadcasts
+ */
+@serializable
+case class SourceInfo (val hostAddress: String,
+                       val listenPort: Int,
+                       val totalBlocks: Int = SourceInfo.UnusedParam,
+                       val totalBytes: Int = SourceInfo.UnusedParam,
+                       val blockSize: Int = Broadcast.BlockSize)
+extends Comparable[SourceInfo] with Logging {
+
+  var currentLeechers = 0
+  var receptionFailed = false
+
+  var hasBlocks = 0
+  var hasBlocksBitVector: BitSet = new BitSet (totalBlocks)
+
+  // Ascending sort based on leecher count
+  def compareTo (o: SourceInfo): Int = (currentLeechers - o.currentLeechers)
+}
+
+/**
+ * Helper Object of SourceInfo for its constants
+ */
+object SourceInfo {
+  // Constants for special values of listenPort
+  val TxNotStartedRetry = -1
+  val TxOverGoToHDFS = 0
+  // Other constants
+  val StopBroadcast = -2
+  val UnusedParam = 0
+}