ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bug fix + formatting.

Browse source
This commit is contained in:
Mosharaf Chowdhury 2010-12-25 22:54:46 -08:00
parent ba71b61e40
commit 20eec59f04
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/scala/spark/BitTorrentBroadcast.scala
View file

@ -334,12 +334,12 @@ extends Broadcast[T] with Logging {
do {
try {
// Connect to the tracker to find out GuideInfo
val clientSocketToTracker =
clientSocketToTracker =
new Socket(BitTorrentBroadcast.MasterHostAddress, BitTorrentBroadcast.MasterTrackerPort)
val oosTracker =
oosTracker =
new ObjectOutputStream (clientSocketToTracker.getOutputStream)
oosTracker.flush
val oisTracker =
oisTracker =
new ObjectInputStream (clientSocketToTracker.getInputStream)
// Send UUID and receive GuideInfo

4
src/scala/spark/Broadcast.scala
View file

@ -30,7 +30,6 @@ extends Logging {
if (!initialized) {
val broadcastFactoryClass = System.getProperty("spark.broadcast.factory",
"spark.DfsBroadcastFactory")
val booleanArgs = Array[AnyRef] (isMaster.asInstanceOf[AnyRef])
broadcastFactory =
Class.forName(broadcastFactoryClass).newInstance.asInstanceOf[BroadcastFactory]
@ -93,7 +92,8 @@ extends Comparable[SourceInfo] with Logging {
var hasBlocksBitVector: BitSet = new BitSet (totalBlocks)
// Ascending sort based on leecher count
def compareTo (o: SourceInfo): Int = (currentLeechers - o.currentLeechers)}
def compareTo (o: SourceInfo): Int = (currentLeechers - o.currentLeechers)
}
object SourceInfo {
// Constants for special values of listenPort

6
src/scala/spark/ChainedBroadcast.scala
View file

@ -208,12 +208,12 @@ extends Broadcast[T] with Logging {
do {
try {
// Connect to the tracker to find out the guide
val clientSocketToTracker =
clientSocketToTracker =
new Socket(ChainedBroadcast.MasterHostAddress, ChainedBroadcast.MasterTrackerPort)
val oosTracker =
oosTracker =
new ObjectOutputStream (clientSocketToTracker.getOutputStream)
oosTracker.flush
val oisTracker =
oisTracker =
new ObjectInputStream (clientSocketToTracker.getInputStream)
// Send UUID and receive masterListenPort