Remove UI parts of this change set

Refactor MemoryListener to core from UI.

Author: jsoltren

core/src/main/scala/org/apache/spark/ui/memory/MemoryTab.scala renamed to core/src/main/scala/org/apache/spark/memory/MemoryListener.scala

@@ -15,22 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.spark.ui.memory
+package org.apache.spark.memory
 
 import scala.collection.mutable.HashMap
 
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.executor.{ExecutorMetrics, TransportMetrics}
 import org.apache.spark.scheduler._
 import org.apache.spark.scheduler.cluster.ExecutorInfo
-import org.apache.spark.ui.{SparkUI, SparkUITab}
-
-private[ui] class MemoryTab(parent: SparkUI) extends SparkUITab(parent, "memory") {
-  val memoryListener = parent.memoryListener
-  val progressListener = parent.jobProgressListener
-  attachPage(new MemoryPage(this))
-  attachPage(new StageMemoryPage(this))
-}
 
 /**
  * :: DeveloperApi ::

core/src/main/scala/org/apache/spark/ui/SparkUI.scala

@@ -31,7 +31,6 @@ import org.apache.spark.ui.JettyUtils._
 import org.apache.spark.ui.env.{EnvironmentListener, EnvironmentTab}
 import org.apache.spark.ui.exec.{ExecutorsListener, ExecutorsTab}
 import org.apache.spark.ui.jobs.{JobProgressListener, JobsTab, StagesTab}
-import org.apache.spark.ui.memory.{MemoryListener, MemoryTab}
 import org.apache.spark.ui.scope.RDDOperationGraphListener
 import org.apache.spark.ui.storage.{StorageListener, StorageTab}
 import org.apache.spark.util.Utils
@@ -48,7 +47,6 @@ private[spark] class SparkUI private (
     val executorsListener: ExecutorsListener,
     val jobProgressListener: JobProgressListener,
     val storageListener: StorageListener,
-    val memoryListener: MemoryListener,
     val operationGraphListener: RDDOperationGraphListener,
     var appName: String,
     val basePath: String,
@@ -73,7 +71,6 @@ private[spark] class SparkUI private (
     attachTab(new StorageTab(this))
     attachTab(new EnvironmentTab(this))
     attachTab(new ExecutorsTab(this))
-    attachTab(new MemoryTab(this))
     attachHandler(createStaticHandler(SparkUI.STATIC_RESOURCE_DIR, "/static"))
     attachHandler(createRedirectHandler("/", "/jobs/", basePath = basePath))
     attachHandler(ApiRootResource.getServletHandler(this))
@@ -213,18 +210,16 @@ private[spark] object SparkUI {
     val storageStatusListener = new StorageStatusListener(conf)
     val executorsListener = new ExecutorsListener(storageStatusListener, conf)
     val storageListener = new StorageListener(storageStatusListener)
-    val memoryListener = new MemoryListener
     val operationGraphListener = new RDDOperationGraphListener(conf)
 
     listenerBus.addListener(environmentListener)
     listenerBus.addListener(storageStatusListener)
     listenerBus.addListener(executorsListener)
     listenerBus.addListener(storageListener)
-    listenerBus.addListener(memoryListener)
     listenerBus.addListener(operationGraphListener)
 
     new SparkUI(sc, conf, securityManager, environmentListener, storageStatusListener,
-      executorsListener, _jobProgressListener, storageListener, memoryListener,
-      operationGraphListener, appName, basePath, startTime)
+      executorsListener, _jobProgressListener, storageListener, operationGraphListener,
+      appName, basePath, startTime)
   }
 }

core/src/main/scala/org/apache/spark/ui/memory/MemoryPage.scala

@@ -31,6 +31,7 @@ import org.apache.spark._
 import org.apache.spark.deploy.SparkHadoopUtil
 import org.apache.spark.internal.Logging
 import org.apache.spark.io._
+import org.apache.spark.memory.{MemoryListener, MemTime}
 import org.apache.spark.util.{JsonProtocol, Utils}
 
 /**

core/src/main/scala/org/apache/spark/ui/memory/MemoryTable.scala

@@ -19,6 +19,7 @@ package org.apache.spark.ui.memory
 
 import org.apache.spark._
 import org.apache.spark.executor._
+import org.apache.spark.memory.{MemoryListener, MemTime, TransportMemSize}
 import org.apache.spark.scheduler._
 import org.apache.spark.scheduler.cluster._