From aa396d408e441933fb84500f2e53875c43d7a6eb Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Thu, 10 Apr 2014 20:33:45 -0700 Subject: [PATCH] Rename tabs and pages (No more IndexPage.scala) Previously there were 7 different IndexPage.scala's in different packages. --- .../deploy/history/{IndexPage.scala => HistoryPage.scala} | 0 .../deploy/master/ui/{IndexPage.scala => MasterPage.scala} | 0 .../deploy/worker/ui/{IndexPage.scala => WorkerPage.scala} | 0 core/src/main/scala/org/apache/spark/ui/SparkUI.scala | 4 ++-- .../spark/ui/env/{IndexPage.scala => EnvironmentPage.scala} | 0 .../spark/ui/exec/{IndexPage.scala => ExecutorsPage.scala} | 0 .../ui/jobs/{IndexPage.scala => JobProgressPage.scala} | 0 .../main/scala/org/apache/spark/ui/storage/RDDPage.scala | 2 +- .../spark/ui/storage/{IndexPage.scala => StoragePage.scala} | 2 +- .../ui/storage/{BlockManagerTab.scala => StorageTab.scala} | 6 +++--- 10 files changed, 7 insertions(+), 7 deletions(-) rename core/src/main/scala/org/apache/spark/deploy/history/{IndexPage.scala => HistoryPage.scala} (100%) rename core/src/main/scala/org/apache/spark/deploy/master/ui/{IndexPage.scala => MasterPage.scala} (100%) rename core/src/main/scala/org/apache/spark/deploy/worker/ui/{IndexPage.scala => WorkerPage.scala} (100%) rename core/src/main/scala/org/apache/spark/ui/env/{IndexPage.scala => EnvironmentPage.scala} (100%) rename core/src/main/scala/org/apache/spark/ui/exec/{IndexPage.scala => ExecutorsPage.scala} (100%) rename core/src/main/scala/org/apache/spark/ui/jobs/{IndexPage.scala => JobProgressPage.scala} (100%) rename core/src/main/scala/org/apache/spark/ui/storage/{IndexPage.scala => StoragePage.scala} (96%) rename core/src/main/scala/org/apache/spark/ui/storage/{BlockManagerTab.scala => StorageTab.scala} (92%) diff --git a/core/src/main/scala/org/apache/spark/deploy/history/IndexPage.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala similarity index 100% rename from core/src/main/scala/org/apache/spark/deploy/history/IndexPage.scala rename to core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/IndexPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala similarity index 100% rename from core/src/main/scala/org/apache/spark/deploy/master/ui/IndexPage.scala rename to core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala similarity index 100% rename from core/src/main/scala/org/apache/spark/deploy/worker/ui/IndexPage.scala rename to core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala index 2eda1aff5ac73..38ef4dfe501b4 100644 --- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala +++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala @@ -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. @@ -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")) diff --git a/core/src/main/scala/org/apache/spark/ui/env/IndexPage.scala b/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala similarity index 100% rename from core/src/main/scala/org/apache/spark/ui/env/IndexPage.scala rename to core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala diff --git a/core/src/main/scala/org/apache/spark/ui/exec/IndexPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala similarity index 100% rename from core/src/main/scala/org/apache/spark/ui/exec/IndexPage.scala rename to core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/IndexPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressPage.scala similarity index 100% rename from core/src/main/scala/org/apache/spark/ui/jobs/IndexPage.scala rename to core/src/main/scala/org/apache/spark/ui/jobs/JobProgressPage.scala 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 index 5eaf41c985ecf..e04253aa0336c 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala @@ -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 diff --git a/core/src/main/scala/org/apache/spark/ui/storage/IndexPage.scala b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala similarity index 96% rename from core/src/main/scala/org/apache/spark/ui/storage/IndexPage.scala rename to core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala index 054369bc4730c..f9e6738a1d7e4 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/IndexPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala @@ -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 diff --git a/core/src/main/scala/org/apache/spark/ui/storage/BlockManagerTab.scala b/core/src/main/scala/org/apache/spark/ui/storage/StorageTab.scala similarity index 92% rename from core/src/main/scala/org/apache/spark/ui/storage/BlockManagerTab.scala rename to core/src/main/scala/org/apache/spark/ui/storage/StorageTab.scala index 05b6ef2cf0f4e..0886950c3f8e6 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/BlockManagerTab.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/StorageTab.scala @@ -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)) @@ -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]()