small cleanup of accidental changes

squito · squito · commit b252e7a3752e · 2015-02-06T15:30:21.000-06:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
@@ -22,7 +22,6 @@ import org.json4s.JsonDSL._
 import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, WorkerStateResponse}
 import org.apache.spark.deploy.master.{ApplicationInfo, DriverInfo, WorkerInfo}
 import org.apache.spark.deploy.worker.ExecutorRunner
-import org.json4s._
 
 private[spark] object JsonProtocol {
  def writeWorkerInfo(obj: WorkerInfo) = {
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
@@ -19,9 +19,6 @@ package org.apache.spark.deploy.history
 
 import javax.servlet.http.HttpServletRequest
 
-import org.json4s.JValue
-import org.json4s.JsonDSL._
-
 import scala.xml.Node
 
 import org.apache.spark.ui.{WebUIPage, UIUtils}
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala
@@ -115,7 +115,6 @@ class HistoryServer(
    * this UI with the event logs in the provided base directory.
    */
   def initialize() {
-    //earlier handlers take precedence
     attachPage(new HistoryPage(this))
 
     val jsonHandler = new JsonRequestHandler(this, securityManager)
diff --git a/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala b/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala
@@ -19,35 +19,13 @@ package org.apache.spark.ui.env
 
 import javax.servlet.http.HttpServletRequest
 
-import org.json4s.{JObject, JValue}
-import org.json4s.JsonDSL._
-
 import scala.xml.Node
 
 import org.apache.spark.ui.{UIUtils, WebUIPage}
 
 private[ui] class EnvironmentPage(parent: EnvironmentTab) extends WebUIPage("") {
   private val listener = parent.listener
 
-  override def renderJson(request: HttpServletRequest): JValue = {
-    val jvmInfoJson =
-      ("Runtime Information" -> listener.jvmInformation.foldLeft(JObject())(_ ~ _))
-    val sparkPropertiesJson =
-      ("Spark Properties" -> listener.sparkProperties.foldLeft(JObject())(_ ~ _))
-    val systemPropertiesJson =
-      ("System Properties" -> listener.systemProperties.foldLeft(JObject())(_ ~ _))
-    val classPathEntriesJson =
-      ("Classpath Entries" -> listener.classpathEntries.foldLeft(JObject())(_ ~ _))
-
-    val environmentJson =
-      jvmInfoJson ~
-      sparkPropertiesJson ~
-      systemPropertiesJson ~
-      classPathEntriesJson
-
-    environmentJson
-  }
-
   def render(request: HttpServletRequest): Seq[Node] = {
     val runtimeInformationTable = UIUtils.listingTable(
       propertyHeader, jvmRow, listener.jvmInformation, fixedWidth = true)
diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala
@@ -24,9 +24,6 @@ import org.apache.spark.status.api.ExecutorSummary
 
 import scala.xml.Node
 
-import org.json4s.JValue
-import org.json4s.JsonDSL._
-
 import org.apache.spark.ui.{ToolTips, UIUtils, WebUIPage}
 import org.apache.spark.util.Utils
 
@@ -159,6 +156,7 @@ private[ui] class ExecutorsPage(
 }
 
 private[spark] object ExecutorsPage {
+  /** Represent an executor's info as a map given a storage status index */
   def getExecInfo(listener: ExecutorsListener, statusId: Int): ExecutorSummary = {
     val status = listener.storageStatusList(statusId)
     val execId = status.blockManagerId.executorId
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
@@ -17,9 +17,6 @@
 
 package org.apache.spark.ui.jobs
 
-import org.json4s.{JInt, JNothing, JObject, JString, JValue}
-import org.json4s.JsonDSL._
-
 import scala.xml.{Node, NodeSeq}
 
 import javax.servlet.http.HttpServletRequest
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala
@@ -19,10 +19,6 @@ package org.apache.spark.ui.jobs
 
 import javax.servlet.http.HttpServletRequest
 
-import org.apache.spark.util.JsonProtocol
-import org.json4s.JValue
-import org.json4s.JsonDSL._
-
 import scala.xml.{Node, NodeSeq}
 
 import org.apache.spark.scheduler.Schedulable
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
@@ -17,10 +17,6 @@
 
 package org.apache.spark.ui.jobs
 
-import org.apache.spark.util.JsonProtocol
-import org.json4s.{JNothing, JValue}
-import org.json4s.JsonDSL._
-
 import scala.collection.mutable
 import scala.xml.{NodeSeq, Node}
 
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala
@@ -19,49 +19,16 @@ package org.apache.spark.ui.jobs
 
 import javax.servlet.http.HttpServletRequest
 
-import org.apache.spark.util.JsonProtocol
-
 import scala.xml.Node
 
-import org.json4s.JValue
-import org.json4s.JsonDSL._
-
-import org.apache.spark.scheduler.{Schedulable, StageInfo}
+import org.apache.spark.scheduler.StageInfo
 import org.apache.spark.ui.{WebUIPage, UIUtils}
 
 /** Page showing specific pool details */
 private[ui] class PoolPage(parent: StagesTab) extends WebUIPage("pool") {
   private val sc = parent.sc
   private val listener = parent.listener
 
-  override def renderJson(request: HttpServletRequest): JValue = {
-    listener.synchronized {
-      val poolName = request.getParameter("poolname")
-      val poolToActiveStages = listener.poolToActiveStages
-      val activeStages = poolToActiveStages.get(poolName) match {
-        case Some(s) => s.values.map {
-          case info: StageInfo =>
-            JsonProtocol.stageInfoToJson(info)
-        }
-        case None => Seq[JValue]()
-      }
-
-      val pools:Option[Schedulable] = sc.flatMap{_.getPoolForName(poolName)}
-
-      val poolListJson =
-        pools.map { schedulable =>
-          ("Pool Name" -> schedulable.name) ~
-          ("Minimum Share" -> schedulable.minShare) ~
-          ("Pool Weight" -> schedulable.weight) ~
-          ("Active Stages" -> activeStages) ~
-          ("Running Tasks" -> schedulable.runningTasks) ~
-          ("Scheduling Mode" -> schedulable.schedulingMode.toString)
-        }
-
-      poolListJson
-    }
-  }
-
   def render(request: HttpServletRequest): Seq[Node] = {
     listener.synchronized {
       val poolName = request.getParameter("poolname")
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -26,12 +26,9 @@ import org.apache.commons.lang3.StringEscapeUtils
 
 import org.apache.spark.executor.TaskMetrics
 import org.apache.spark.scheduler.{AccumulableInfo, TaskInfo}
-
-import org.json4s.{JNothing, JValue}
-
 import org.apache.spark.ui.{ToolTips, WebUIPage, UIUtils}
 import org.apache.spark.ui.jobs.UIData._
-import org.apache.spark.util.{JsonProtocol, Utils, Distribution}
+import org.apache.spark.util.{Utils, Distribution}
 
 /** Page showing statistics and task list for a given stage */
 private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
diff --git a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala
@@ -19,14 +19,9 @@ package org.apache.spark.ui.storage
 
 import javax.servlet.http.HttpServletRequest
 
-import org.apache.spark.status.api.{RDDPartitionInfo, RDDDataDistribution}
-
 import scala.xml.Node
 
-import org.json4s.{JNothing, JValue}
-import org.json4s.JsonDSL._
-
-import org.apache.spark.storage._
+import org.apache.spark.status.api.{RDDPartitionInfo, RDDDataDistribution}
 import org.apache.spark.ui.{WebUIPage, UIUtils}
 import org.apache.spark.util.Utils
 
diff --git a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala
@@ -20,13 +20,9 @@ package org.apache.spark.ui.storage
 import javax.servlet.http.HttpServletRequest
 
 import scala.xml.Node
-
-import org.json4s.JValue
-import org.json4s.JsonDSL._
-
 import org.apache.spark.storage.RDDInfo
 import org.apache.spark.ui.{WebUIPage, UIUtils}
-import org.apache.spark.util.{JsonProtocol, Utils}
+import org.apache.spark.util.Utils
 
 /** Page showing list of RDD's currently stored in the cluster */
 private[ui] class StoragePage(parent: StorageTab) extends WebUIPage("") {
diff --git a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala
@@ -19,7 +19,6 @@ package org.apache.spark.util
 
 import java.util.{Properties, UUID}
 
-import org.apache.spark.deploy.history.ApplicationHistoryInfo
 import org.apache.spark.scheduler.cluster.ExecutorInfo
 
 import scala.collection.JavaConverters._
diff --git a/core/src/test/scala/org/apache/spark/util/JsonProtocolSuite.scala b/core/src/test/scala/org/apache/spark/util/JsonProtocolSuite.scala
@@ -280,10 +280,6 @@ class JsonProtocolSuite extends FunSuite {
     assertEquals(expectedJobEnd, JsonProtocol.jobEndFromJson(oldEndEvent))
   }
 
-  test("new UI json methods") {
-    pending
-  }
-
   /** -------------------------- *
    | Helper test running methods |
    * --------------------------- */
