From e2e954d20eb10e18d096ad4b6f867f889fab517c Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 10:19:08 -0700 Subject: [PATCH 1/8] [SPARK-17724] replace line break with a space --- .../main/resources/org/apache/spark/ui/static/spark-dag-viz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js index 1b0d4692d9cd0..8234ed6380de6 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js +++ b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js @@ -474,7 +474,7 @@ function connectRDDs(fromRDDId, toRDDId, edgesContainer, svgContainer) { function addTooltipsForRDDs(svgContainer) { svgContainer.selectAll("g.node").each(function() { var node = d3.select(this); - var tooltipText = node.attr("name"); + var tooltipText = node.attr("name").replace("\\n", " "); if (tooltipText) { node.select("circle") .attr("data-toggle", "tooltip") From a0a74167df7571732680f7906f64430bbc2a2353 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 13:53:22 -0700 Subject: [PATCH 2/8] [SPARK-17724] fix typo --- .../main/resources/org/apache/spark/ui/static/spark-dag-viz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js index 8234ed6380de6..8deb1d3874791 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js +++ b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js @@ -35,7 +35,7 @@ * primitives (e.g. take, any SQL query). * * In the visualization, an RDD is expressed as a node, and its dependencies - * as directed edges (from parent to child). operation scopes, stages, and + * as directed edges (from parent to child). Operation scopes, stages, and * jobs are expressed as clusters that may contain one or many nodes. These * clusters may be nested inside of each other in the scenarios described * above. From a2f2a96bf85c844bc1925b18e13fd2cc91293efa Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 15:05:51 -0700 Subject: [PATCH 3/8] [SPARK-17724] remove unused import --- .../main/scala/org/apache/spark/sql/execution/ExistingRDD.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ExistingRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ExistingRDD.scala index 6c4248c60e893..551459852101a 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ExistingRDD.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ExistingRDD.scala @@ -23,7 +23,6 @@ import org.apache.spark.sql.catalyst.{CatalystTypeConverters, InternalRow} import org.apache.spark.sql.catalyst.analysis.MultiInstanceRelation import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.plans.logical._ -import org.apache.spark.sql.execution.datasources._ import org.apache.spark.sql.execution.metric.SQLMetrics import org.apache.spark.sql.types.DataType import org.apache.spark.util.Utils From 01f8f0a81a04478bc87c7eeecd64fb4a55cf31b7 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 15:20:25 -0700 Subject: [PATCH 4/8] [SPARK-17724] remove unused import --- .../scala/org/apache/spark/ui/scope/RDDOperationGraph.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/scope/RDDOperationGraph.scala b/core/src/main/scala/org/apache/spark/ui/scope/RDDOperationGraph.scala index 0e330879d50f9..b5d41f114c604 100644 --- a/core/src/main/scala/org/apache/spark/ui/scope/RDDOperationGraph.scala +++ b/core/src/main/scala/org/apache/spark/ui/scope/RDDOperationGraph.scala @@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringEscapeUtils import org.apache.spark.internal.Logging import org.apache.spark.scheduler.StageInfo -import org.apache.spark.storage.{RDDInfo, StorageLevel} +import org.apache.spark.storage.StorageLevel /** * A representation of a generic cluster graph used for storing information on RDD operations. From d6d7e4661bc05e69f0b77b7284c0ea086e66d325 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 17:12:21 -0700 Subject: [PATCH 5/8] [SPARK-17724] unnecessary semicolon --- .../src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala index 7953d77fd7ece..7e96042889092 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala @@ -58,7 +58,7 @@ private[ui] class ExecutorsPage( ++ } - ; + UIUtils.headerSparkPage("Executors", content, parent, useDataTables = true) } From 968f8cfd52a11d17383f7d29d8bb849906240680 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 17:15:09 -0700 Subject: [PATCH 6/8] [SPARK-17724] remove unused variable --- core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala index 7e96042889092..2eae3afff04a9 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala @@ -47,7 +47,6 @@ private[ui] class ExecutorsPage( parent: ExecutorsTab, threadDumpEnabled: Boolean) extends WebUIPage("") { - private val listener = parent.listener def render(request: HttpServletRequest): Seq[Node] = { val content = From b078fd2c3f82c807d06d95858c2704b5023033d0 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 17:20:31 -0700 Subject: [PATCH 7/8] [SPARK-17724] remove unused import --- .../scala/org/apache/spark/ui/jobs/JobProgressListener.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala index 83dc5d874589e..55cc6a5badbee 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala @@ -19,7 +19,7 @@ package org.apache.spark.ui.jobs import java.util.concurrent.TimeoutException -import scala.collection.mutable.{HashMap, HashSet, LinkedHashMap, ListBuffer} +import scala.collection.mutable.{HashMap, HashSet, ListBuffer} import org.apache.spark._ import org.apache.spark.annotation.DeveloperApi From e50dc17ee4b243312ef4e07bb3ef2efb03a0c5b3 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 4 Oct 2016 17:24:20 -0700 Subject: [PATCH 8/8] [SPARK-17724] unnecessary semicolon --- core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 606d15d599e81..457267a2a5ef8 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 @@ -139,7 +139,7 @@ private[ui] class RDDPage(parent: StorageTab) extends WebUIPage("rdd") { {rddStorageInfo.partitions.map(_.size).getOrElse(0)} Partitions {blockTableHTML ++ jsForScrollingDownToBlockTable} - ; + UIUtils.headerSparkPage("RDD Storage Info for " + rddStorageInfo.name, content, parent) }