Review comments are addressing

apache · May 2, 2020 · 817ebab · 817ebab
1 parent 6c5c2f9
commit 817ebab
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/SqlResource.scala b/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/SqlResource.scala
@@ -92,10 +92,12 @@ private[v1] class SqlResource extends BaseAppResource {
     metricDetails.sortBy(_.nodeId).reverse
   }
 
-  private def prepareExecutionData(exec: SQLExecutionUIData,
-                                   nodeIdAndWSCGIdMap: Map[Long, Option[Long]] = Map.empty,
-                                   details: Boolean,
-                                   planDescription: Boolean): ExecutionData = {
+  private def prepareExecutionData(
+    exec: SQLExecutionUIData,
+    nodeIdAndWSCGIdMap: Map[Long, Option[Long]] = Map.empty,
+    details: Boolean,
+    planDescription: Boolean): ExecutionData = {
+
     var running = Seq[Int]()
     var completed = Seq[Int]()
     var failed = Seq[Int]()
@@ -121,8 +123,12 @@ private[v1] class SqlResource extends BaseAppResource {
     val duration = exec.completionTime.getOrElse(new Date()).getTime - exec.submissionTime
     val planDetails = if (details && planDescription) exec.physicalPlanDescription else ""
     val metrics =
-      if (details) printableMetrics(exec.metrics, exec.metricValues, nodeIdAndWSCGIdMap)
-      else Seq.empty
+      if (details) {
+        printableMetrics(exec.metrics, exec.metricValues, nodeIdAndWSCGIdMap)
+      } else {
+        Seq.empty
+      }
+
     new ExecutionData(
       exec.executionId,
       status,
@@ -138,10 +144,11 @@ private[v1] class SqlResource extends BaseAppResource {
 
   private def getNodeIdAndWSCGIdMap(graph: SparkPlanGraph): Map[Long, Option[Long]] = {
     val wscgNodes = graph.allNodes.filter(_.name.trim.startsWith(WHOLE_STAGE_CODEGEN))
-    val nodeIdAndWSCGIdMap: Map[Long, Option[Long]] = wscgNodes.flatMap { _ match {
-      case x: SparkPlanGraphCluster => x.nodes.map(_.id -> getWholeStageCodegenId(x.name.trim))
-      case _ => Seq.empty
-    }
+    val nodeIdAndWSCGIdMap: Map[Long, Option[Long]] = wscgNodes.flatMap {
+      _ match {
+        case x: SparkPlanGraphCluster => x.nodes.map(_.id -> getWholeStageCodegenId(x.name.trim))
+        case _ => Seq.empty
+      }
     }.toMap
 
     nodeIdAndWSCGIdMap

diff --git a/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/api.scala b/sql/core/src/main/scala/org/apache/spark/status/api/v1/sql/api.scala
@@ -30,9 +30,10 @@ class ExecutionData private[spark] (
     val failedJobIds: Seq[Int],
     val metricDetails: Seq[MetricDetails])
 
-case class MetricDetails private[spark] (nodeId: Long,
-                                         nodeName: String,
-                                         wholeStageCodegenId: Option[Long] = None,
-                                         metrics: Seq[Metric])
+case class MetricDetails private[spark] (
+    nodeId: Long,
+    nodeName: String,
+    wholeStageCodegenId: Option[Long] = None,
+    metrics: Seq[Metric])
 
 case class Metric private[spark] (name: String, value: String)