Skip to content

Rename tabs and pages (No more IndexPage.scala) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdas merged 1 commit into from
Apr 11, 2014
Merged

Rename tabs and pages (No more IndexPage.scala) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ache/spark/deploy/history/IndexPage.scala → ...he/spark/deploy/history/HistoryPage.scala
View file
Open in desktop
File renamed without changes.
0 ...he/spark/deploy/master/ui/IndexPage.scala → ...e/spark/deploy/master/ui/MasterPage.scala
View file
Open in desktop
File renamed without changes.
0 ...he/spark/deploy/worker/ui/IndexPage.scala → ...e/spark/deploy/worker/ui/WorkerPage.scala
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/ui/SparkUI.scala
View file
Open in desktop
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
0 ...a/org/apache/spark/ui/env/IndexPage.scala → ...apache/spark/ui/env/EnvironmentPage.scala
View file
Open in desktop
File renamed without changes.
0 .../org/apache/spark/ui/exec/IndexPage.scala → .../apache/spark/ui/exec/ExecutorsPage.scala
View file
Open in desktop
File renamed without changes.
0 .../org/apache/spark/ui/jobs/IndexPage.scala → ...pache/spark/ui/jobs/JobProgressPage.scala
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...g/apache/spark/ui/storage/IndexPage.scala → ...apache/spark/ui/storage/StoragePage.scala
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...he/spark/ui/storage/BlockManagerTab.scala → .../apache/spark/ui/storage/StorageTab.scala
View file
Open in desktop
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