Skip to content

Commit

Permalink
Merge pull request alteryx#6 from andrewor14/ui-refactor
Browse files Browse the repository at this point in the history
Rename tabs and pages (No more IndexPage.scala)
  • Loading branch information
tdas committed Apr 11, 2014
2 parents f8e1053 + aa396d4 commit 72fe256
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/ui/SparkUI.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.apache.spark.ui.JettyUtils._
import org.apache.spark.ui.env.EnvironmentTab
import org.apache.spark.ui.exec.ExecutorsTab
import org.apache.spark.ui.jobs.JobProgressTab
import org.apache.spark.ui.storage.BlockManagerTab
import org.apache.spark.ui.storage.StorageTab

/**
* Top level user interface for Spark.
Expand Down Expand Up @@ -55,7 +55,7 @@ private[spark] class SparkUI(
def initialize() {
listenerBus.addListener(storageStatusListener)
attachTab(new JobProgressTab(this))
attachTab(new BlockManagerTab(this))
attachTab(new StorageTab(this))
attachTab(new EnvironmentTab(this))
attachTab(new ExecutorsTab(this))
attachHandler(createStaticHandler(SparkUI.STATIC_RESOURCE_DIR, "/static"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.spark.ui.{WebUIPage, UIUtils}
import org.apache.spark.util.Utils

/** Page showing storage details for a given RDD */
private[ui] class RddPage(parent: BlockManagerTab) extends WebUIPage("rdd") {
private[ui] class RddPage(parent: StorageTab) extends WebUIPage("rdd") {
private val appName = parent.appName
private val basePath = parent.basePath
private val listener = parent.listener
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.spark.ui.{WebUIPage, UIUtils}
import org.apache.spark.util.Utils

/** Page showing list of RDD's currently stored in the cluster */
private[ui] class IndexPage(parent: BlockManagerTab) extends WebUIPage("") {
private[ui] class IndexPage(parent: StorageTab) extends WebUIPage("") {
private val appName = parent.appName
private val basePath = parent.basePath
private val listener = parent.listener
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import org.apache.spark.scheduler._
import org.apache.spark.storage.{RDDInfo, StorageStatusListener, StorageUtils}

/** Web UI showing storage status of all RDD's in the given SparkContext. */
private[ui] class BlockManagerTab(parent: SparkUI) extends WebUITab(parent, "storage") {
private[ui] class StorageTab(parent: SparkUI) extends WebUITab(parent, "storage") {
val appName = parent.appName
val basePath = parent.basePath
val listener = new BlockManagerListener(parent.storageStatusListener)
val listener = new StorageListener(parent.storageStatusListener)

attachPage(new IndexPage(this))
attachPage(new RddPage(this))
Expand All @@ -37,7 +37,7 @@ private[ui] class BlockManagerTab(parent: SparkUI) extends WebUITab(parent, "sto
/**
* A SparkListener that prepares information to be displayed on the BlockManagerUI
*/
private[ui] class BlockManagerListener(storageStatusListener: StorageStatusListener)
private[ui] class StorageListener(storageStatusListener: StorageStatusListener)
extends SparkListener {

private val _rddInfoMap = mutable.Map[Int, RDDInfo]()
Expand Down

0 comments on commit 72fe256

Please sign in to comment.