More code style cleanup;

- memCol -> sizeCol
- 4 spaces for parameter indentation
- move `case` statements

Author: JoshRosen

core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala

@@ -54,7 +54,7 @@ private[spark] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app
       <a href={executor.worker.webUiAddress}>{executor.worker.id}</a>
     }
     t.intCol("Cores") { _.cores }
-    t.memCol("Memory") { _.memory }
+    t.sizeCol("Memory") { _.memory }
     t.col("State") { _.state.toString }
     t.customCol("Logs") { executor =>
       <a href={"%s/logPage?appId=%s&executorId=%s&logType=stdout"

core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala

@@ -64,7 +64,7 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
     }
     t.col("Name") { _.id }
     t.intCol("Cores") { _.coresGranted }
-    t.memCol("Memory per Node") { _.desc.memoryPerSlave }
+    t.sizeCol("Memory per Node") { _.desc.memoryPerSlave }
     t.dateCol("Submitted Time") { _.submitDate }
     t.col("User") { _.desc.user }
     t.col("State") { _.state.toString }
@@ -81,7 +81,7 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
     }
     t.col("State") { _.state.toString }
     t.intCol("Cores") { _.desc.cores }
-    t.memCol("Memory") { _.desc.mem.toLong }
+    t.sizeCol("Memory") { _.desc.mem.toLong }
     t.col("Main Class") { _.desc.command.arguments(1) }
     t.build()
   }

core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala

@@ -47,7 +47,7 @@ private[spark] class WorkerPage(parent: WorkerWebUI) extends WebUIPage("") {
     t.intCol("Executor ID") { _.execId }
     t.intCol("Cores") { _.cores }
     t.col("State") { _.state.toString }
-    t.memCol("Memory") { _.memory }
+    t.sizeCol("Memory") { _.memory }
     t.customCol("Job Details") { executor =>
       <ul class="unstyled">
         <li><strong>ID:</strong> {executor.appId}</li>
@@ -70,7 +70,7 @@ private[spark] class WorkerPage(parent: WorkerWebUI) extends WebUIPage("") {
     t.col("Main Class") { _.driverDesc.command.arguments(1) }
     t.col("State") { _.finalState.getOrElse(DriverState.RUNNING).toString }
     t.intCol("Cores") { _.driverDesc.cores }
-    t.memCol("Memory") { _.driverDesc.mem }
+    t.sizeCol("Memory") { _.driverDesc.mem }
     t.customCol("Logs") { driver =>
       <a href={s"logPage?driverId=${driver.driverId}&logType=stdout"}>stdout</a>
       <a href={s"logPage?driverId=${driver.driverId}&logType=stderr"}>stderr</a>

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

@@ -20,7 +20,7 @@ package org.apache.spark.ui
 import java.util.Date
 
 import scala.collection.mutable
-import scala.xml.{Text, Node}
+import scala.xml.{Node, Text}
 
 import org.apache.spark.util.Utils
 
@@ -142,17 +142,7 @@ private[spark] class UITable[T] (cols: Seq[UITableColumn[T, _]], fixedWidth: Boo
  *    Columns have additional options, such as controlling their sort keys; see the individual
  *    methods' documentation for more details.
  *
- *  - Call `build` to construct an immutable object which can be used to render tables.
- *   *
- * To remove some of the boilerplate here, you can statically import the `col` methods; for example:
- *
- *    val myTable: UITable[MyRowDataType] = {
- *      val builder = new UITableBuilder[MyRowDataType]()
- *      import builder._
- *      col("Name") { _.name }
- *      [...]
- *      build
- *    }
+ *  - Call `build()` to construct an immutable object which can be used to render tables.
  *
  * There are many other features, including support for arbitrary markup in custom column types;
  * see the actual uses in the web UI code for more details.
@@ -168,9 +158,9 @@ private[spark] class UITableBuilder[T](fixedWidth: Boolean = false) {
    * render the contents of the TD tag, not the TD tag itself.
    */
   def customCol[V](
-    name: String,
-    sortable: Boolean = true,
-    sortKey: Option[T => String] = None)(renderer: T => Seq[Node]): UITableBuilder[T] = {
+      name: String,
+      sortable: Boolean = true,
+      sortKey: Option[T => String] = None)(renderer: T => Seq[Node]): UITableBuilder[T] = {
     val customColumn = new UITableColumn[T, T](name, null, sortable, sortKey, identity) {
       override def renderCellContents(row: T) = renderer(row)
     }
@@ -179,32 +169,32 @@ private[spark] class UITableBuilder[T](fixedWidth: Boolean = false) {
   }
 
   def col[V](
-    name: String,
-    formatter: V => String,
-    sortable: Boolean = true,
-    sortKey: Option[V => String] = None)(fieldExtractor: T => V): UITableBuilder[T] = {
+      name: String,
+      formatter: V => String,
+      sortable: Boolean = true,
+      sortKey: Option[V => String] = None)(fieldExtractor: T => V): UITableBuilder[T] = {
     cols.append(UITableColumn(name, formatter, sortable, sortKey, fieldExtractor))
     this
   }
 
   def col(
-    name: String,
-    sortable: Boolean = true,
-    sortKey: Option[String => String] = None)(fieldExtractor: T => String): UITableBuilder[T] = {
+      name: String,
+      sortable: Boolean = true,
+      sortKey: Option[String => String] = None)(fieldExtractor: T => String): UITableBuilder[T] = {
     col[String](name, {x: String => x}, sortable, sortKey)(fieldExtractor)
   }
 
   def intCol(
-    name: String,
-    formatter: Int => String = { x: Int => x.toString },
-    sortable: Boolean = true)(fieldExtractor: T => Int): UITableBuilder[T] = {
+      name: String,
+      formatter: Int => String = { x: Int => x.toString },
+      sortable: Boolean = true)(fieldExtractor: T => Int): UITableBuilder[T] = {
     col[Int](name, formatter, sortable = sortable)(fieldExtractor)
   }
 
   /**
-   * Display a column of memory sizes, in megabytes, as human-readable strings, such as "4.0 MB".
+   * Display a column of sizes, in megabytes, as human-readable strings, such as "4.0 MB".
    */
-  def memCol(name: String)(fieldExtractor: T => Long): UITableBuilder[T] = {
+  def sizeCol(name: String)(fieldExtractor: T => Long): UITableBuilder[T] = {
     col[Long](
       name,
       formatter = Utils.megabytesToString,

core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala

@@ -42,16 +42,16 @@ private[ui] class RDDPage(parent: StorageTab) extends WebUIPage("rdd") {
         val remaining = Utils.bytesToString(status.memRemaining)
         Text(s"$used ($remaining Remaining)")
       }
-    t.memCol("Disk Usage") { case (rddId, status) => status.diskUsedByRdd(rddId) }
+    t.sizeCol("Disk Usage") { case (rddId, status) => status.diskUsedByRdd(rddId) }
     t.build()
   }
 
-  val blockTable: UITable[(BlockId, BlockStatus, Seq[String])] = {
+  private val blockTable: UITable[(BlockId, BlockStatus, Seq[String])] = {
     val t = new UITableBuilder[(BlockId, BlockStatus, Seq[String])]()
     t.col("Block Name") { case (id, block, locations) => id.toString }
     t.col("Storage Level") { case (id, block, locations) => block.storageLevel.description }
-    t. memCol("Size in Memory") { case (id, block, locations) => block.memSize }
-    t.memCol("Size on Disk") { case (id, block, locations) => block.diskSize }
+    t. sizeCol("Size in Memory") { case (id, block, locations) => block.memSize }
+    t.sizeCol("Size on Disk") { case (id, block, locations) => block.diskSize }
     t.customCol("Executors") { case (id, block, locations) =>
       locations.map(l => <span>{l}<br/></span>)
     }

core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala

@@ -40,9 +40,9 @@ private[ui] class StoragePage(parent: StorageTab) extends WebUIPage("") {
     t. col("Fraction Cached") { rdd =>
       "%.0f%%".format(rdd.numCachedPartitions * 100.0 / rdd.numPartitions)
     }
-    t.memCol("Size in Memory") { _.memSize }
-    t.memCol("Size in Tachyon") { _.tachyonSize }
-    t.memCol("Size on Disk") { _.diskSize }
+    t.sizeCol("Size in Memory") { _.memSize }
+    t.sizeCol("Size in Tachyon") { _.tachyonSize }
+    t.sizeCol("Size on Disk") { _.diskSize }
     t.build()
   }
 

streaming/src/main/scala/org/apache/spark/streaming/ui/StreamingPage.scala

@@ -100,23 +100,23 @@ private[ui] class StreamingPage(parent: StreamingTab)
         t.col("Records in last batch\n[" + formatDate(Calendar.getInstance().getTime()) + "]") {
           case (receiverId, _) => formatNumber(lastBatchReceivedRecord(receiverId))
         }
-        t.col("Minimum rate\n[records/sec]") {
-          case (receiverId, _) => receivedRecordDistributions(receiverId).map {
+        t.col("Minimum rate\n[records/sec]") { case (receiverId, _) =>
+          receivedRecordDistributions(receiverId).map {
             _.getQuantiles(Seq(0.0)).map(formatNumber).head
           }.getOrElse(empty)
         }
-        t.col("Median rate\n[records/sec]") {
-          case (receiverId, _) => receivedRecordDistributions(receiverId).map {
+        t.col("Median rate\n[records/sec]") { case (receiverId, _) =>
+          receivedRecordDistributions(receiverId).map {
             _.getQuantiles(Seq(0.5)).map(formatNumber).head
           }.getOrElse(empty)
         }
-        t.col("Maximum rate\n[records/sec]") {
-          case (receiverId, _) => receivedRecordDistributions(receiverId).map {
+        t.col("Maximum rate\n[records/sec]") { case (receiverId, _) =>
+          receivedRecordDistributions(receiverId).map {
             _.getQuantiles(Seq(1.0)).map(formatNumber).head
           }.getOrElse(empty)
         }
-        t.col("Last Error") {
-          case (_, receiverInfo) => receiverInfo.map { info =>
+        t.col("Last Error") { case (_, receiverInfo) =>
+          receiverInfo.map { info =>
             val msg = s"${info.lastErrorMessage} - ${info.lastError}"
             if (msg.size > 100) msg.take(97) + "..." else msg
           }.getOrElse(empty)