More merge fixes

Author: pwendell

core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala

@@ -920,7 +920,7 @@ class DAGScheduler(
               val name = acc.name.get
               val stringPartialValue = "%s".format(partialValue)
               val stringValue = "%s".format(acc.value)
-              stageToInfos(stage).accumulables(id) = AccumulableInfo(id, name, stringValue)
+              stage.info.accumulables(id) = AccumulableInfo(id, name, stringValue)
               event.taskInfo.accumulables +=
                 AccumulableInfo(id, name, Some(stringPartialValue), stringValue)
             }

core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala

@@ -52,7 +52,7 @@ private[ui] class StagePage(parent: JobProgressTab) extends WebUIPage("stage") {
       val tasks = stageData.taskData.values.toSeq.sortBy(_.taskInfo.launchTime)
 
       val numCompleted = tasks.count(_.taskInfo.finished)
-      val accumulables = listener.stageIdToAccumulables(stageId)
+      val accumulables = listener.stageIdToData(stageId).accumulables
       val hasInput = stageData.inputBytes > 0
       val hasShuffleRead = stageData.shuffleReadBytes > 0
       val hasShuffleWrite = stageData.shuffleWriteBytes > 0

core/src/main/scala/org/apache/spark/ui/jobs/UIData.scala

@@ -51,7 +51,7 @@ private[jobs] object UIData {
     var schedulingPool: String = ""
     var description: Option[String] = None
 
-    var accumulables = HashMap[Long, AccumulableInfo]
+    var accumulables = new HashMap[Long, AccumulableInfo]
     var taskData = new HashMap[Long, TaskUIData]
     var executorSummary = new HashMap[String, ExecutorSummary]
   }