From f47a2e30887ea23f2b10e08090df31bc64948d1b Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Wed, 11 Jan 2017 22:31:08 -0800 Subject: [PATCH 01/13] [SPARK-17724] remove unsued import, syntax --- .../main/resources/org/apache/spark/ui/static/spark-dag-viz.js | 2 +- .../scala/org/apache/spark/ui/jobs/JobProgressListener.scala | 2 +- .../scala/org/apache/spark/ui/scope/RDDOperationGraph.scala | 2 +- core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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..17c0850308d80 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. 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 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. 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 227e940c9c50c..ab42e4a5cc1a6 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) } From e5082567a0800bcfffe1db3fea59968bfa7102ba Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Thu, 12 Jan 2017 00:05:00 -0800 Subject: [PATCH 02/13] remove comma --- .../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 77f1ca3827cb89d69fa41390ba6d8a8045e507a6 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Fri, 13 Jan 2017 20:45:48 -0800 Subject: [PATCH 03/13] [SPARK-17724] node circle tootipText, line break working --- .../main/resources/org/apache/spark/ui/static/spark-dag-viz.js | 3 ++- 1 file changed, 2 insertions(+), 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 17c0850308d80..1ef34e3299f9b 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,11 +474,12 @@ 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") .attr("data-placement", "bottom") + .attr("data-html", "true") .attr("title", tooltipText); } // Link tooltips for all nodes that belong to the same RDD From 2513d156441b386094067694a704c635daf7c76a Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Fri, 13 Jan 2017 21:08:31 -0800 Subject: [PATCH 04/13] [SPARK-17724] remvoe 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 1ef34e3299f9b..00f5be7b7ff9a 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").replace("\\n", "
"); + var tooltipText = node.attr("name").replace("\\n", "
"); if (tooltipText) { node.select("circle") .attr("data-toggle", "tooltip") From 644630dbaa76d05b64abbc81fe649644660de2f1 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Mon, 16 Jan 2017 01:00:50 -0800 Subject: [PATCH 05/13] [SPARK-17724] css and general function --- .../apache/spark/ui/static/spark-dag-viz.css | 2 ++ .../apache/spark/ui/static/spark-dag-viz.js | 23 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css index 9cc5c79f67346..2b154520543e0 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css +++ b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css @@ -81,12 +81,14 @@ #dag-viz-graph svg.job g.node circle { fill: #444; + data-html: true; } #dag-viz-graph svg.job g.node.cached circle { fill: #A3F545; stroke: #52C366; stroke-width: 2px; + data-html: true; } /* Stage page specific styles */ 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 00f5be7b7ff9a..3e4534a83a903 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 @@ -173,6 +173,7 @@ function renderDagViz(forJob) { }); resizeSvg(svg); + intepreteLineBreak(svg); } /* Render the RDD DAG visualization on the stage page. */ @@ -362,6 +363,17 @@ function resizeSvg(svg) { .attr("height", height); } + +function intepreteLineBreak(svg) { + var allTSpan = svg.selectAll("tspan").each(function() { + node = d3.select(this); + var text = replaceLineBreak(node[0][0].innerHTML); + node.text(text); + }); + +} + + /* * (Job page only) Helper function to draw edges that cross stage boundaries. * We need to do this manually because we render each stage separately in dagre-d3. @@ -470,16 +482,23 @@ function connectRDDs(fromRDDId, toRDDId, edgesContainer, svgContainer) { edgesContainer.append("path").datum(points).attr("d", line); } +/* replace /n with
*/ +function replaceLineBreak(str) { + return str.replace("\\n", "
"); +} + + /* (Job page only) Helper function to add tooltips for RDDs. */ function addTooltipsForRDDs(svgContainer) { svgContainer.selectAll("g.node").each(function() { var node = d3.select(this); - var tooltipText = node.attr("name").replace("\\n", "
"); + var tooltipText = replaceLineBreak(node.attr("name")); +// var tooltipText = node.attr("name").replace("\\n", "
"); if (tooltipText) { node.select("circle") .attr("data-toggle", "tooltip") .attr("data-placement", "bottom") - .attr("data-html", "true") +// .attr("data-html", "true") .attr("title", tooltipText); } // Link tooltips for all nodes that belong to the same RDD From 4fc62193d5f9581d3cc12bb98a21c2cbb20318d3 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Tue, 17 Jan 2017 00:29:13 -0800 Subject: [PATCH 06/13] [SPARK-17724] css effort to set data-html be true, is not possible, this is new html5 attr --- .../apache/spark/ui/static/spark-dag-viz.css | 2 -- .../apache/spark/ui/static/spark-dag-viz.js | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css index 2b154520543e0..9cc5c79f67346 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css +++ b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.css @@ -81,14 +81,12 @@ #dag-viz-graph svg.job g.node circle { fill: #444; - data-html: true; } #dag-viz-graph svg.job g.node.cached circle { fill: #A3F545; stroke: #52C366; stroke-width: 2px; - data-html: true; } /* Stage page specific styles */ 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 3e4534a83a903..24a244d2ac7b2 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 @@ -174,6 +174,7 @@ function renderDagViz(forJob) { resizeSvg(svg); intepreteLineBreak(svg); + enableDataHtml(); } /* Render the RDD DAG visualization on the stage page. */ @@ -365,14 +366,18 @@ function resizeSvg(svg) { function intepreteLineBreak(svg) { - var allTSpan = svg.selectAll("tspan").each(function() { - node = d3.select(this); - var text = replaceLineBreak(node[0][0].innerHTML); - node.text(text); - }); - + var allTSpan = svg.selectAll("tspan").each(function() { + node = d3.select(this); + var text = replaceLineBreak(node[0][0].innerHTML); + node.text(text); + d3.select(this).attr("data-html", "true"); + }); } +// +//function enableDataHtml() { +// +//} /* * (Job page only) Helper function to draw edges that cross stage boundaries. @@ -498,7 +503,7 @@ function addTooltipsForRDDs(svgContainer) { node.select("circle") .attr("data-toggle", "tooltip") .attr("data-placement", "bottom") -// .attr("data-html", "true") + .attr("data-html", "true") .attr("title", tooltipText); } // Link tooltips for all nodes that belong to the same RDD From c1252d513e7fdb7318e93f67ceb39a42b3e88004 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Wed, 18 Jan 2017 00:38:25 -0800 Subject: [PATCH 07/13] [SPARK-17724] tmp save --- .../apache/spark/ui/static/spark-dag-viz.js | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) 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 24a244d2ac7b2..354a3d1146bcc 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 @@ -174,7 +174,7 @@ function renderDagViz(forJob) { resizeSvg(svg); intepreteLineBreak(svg); - enableDataHtml(); +// enableDataHtml(); } /* Render the RDD DAG visualization on the stage page. */ @@ -368,9 +368,36 @@ function resizeSvg(svg) { function intepreteLineBreak(svg) { var allTSpan = svg.selectAll("tspan").each(function() { node = d3.select(this); - var text = replaceLineBreak(node[0][0].innerHTML); - node.text(text); - d3.select(this).attr("data-html", "true"); + var original = node[0][0].innerHTML; + if (original.indexOf("\\n") != -1) { + var arr = original.split("\\n"); + var parent = this.parentNode; +// parent.remove(); // remove all children + +// var newNode = document.createElement("tspan"); +// newNode.dy = "1em"; +// newNode.x = "1"; +// newNode.space = "preserve"; + +// .attr("dy", "1em") +// .attr("x", "1") +// .attr("space", "preserve"); + var newNode = node[0][0].clone(); + + node[0][0].innerHTML = arr[0]; + node[0][0].text = arr[0]; +// newNode.attr("innerHTML", arr[1]); + + newNode.attributes = node[0][0].attributes + newNode.innerHTML = arr[1]; + newNode.text = arr[1]; + + parent.appendChild(newNode); + +// var text = replaceLineBreak(original); +// node.text(text); +// d3.select(this).attr("data-html", "true"); + } }); } From e6f7fd1f9d3bfedb0d4de0488a7da5c07e7d2b3c Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Wed, 18 Jan 2017 23:46:12 -0800 Subject: [PATCH 08/13] [SPARK-17724] enable static tspan line break --- .../apache/spark/ui/static/spark-dag-viz.js | 36 +++---------------- 1 file changed, 5 insertions(+), 31 deletions(-) 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 354a3d1146bcc..dfb9400449971 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 @@ -174,7 +174,6 @@ function renderDagViz(forJob) { resizeSvg(svg); intepreteLineBreak(svg); -// enableDataHtml(); } /* Render the RDD DAG visualization on the stage page. */ @@ -371,41 +370,16 @@ function intepreteLineBreak(svg) { var original = node[0][0].innerHTML; if (original.indexOf("\\n") != -1) { var arr = original.split("\\n"); - var parent = this.parentNode; -// parent.remove(); // remove all children - -// var newNode = document.createElement("tspan"); -// newNode.dy = "1em"; -// newNode.x = "1"; -// newNode.space = "preserve"; - -// .attr("dy", "1em") -// .attr("x", "1") -// .attr("space", "preserve"); - var newNode = node[0][0].clone(); + var newNode = this.cloneNode(this); node[0][0].innerHTML = arr[0]; - node[0][0].text = arr[0]; -// newNode.attr("innerHTML", arr[1]); - - newNode.attributes = node[0][0].attributes newNode.innerHTML = arr[1]; - newNode.text = arr[1]; - - parent.appendChild(newNode); -// var text = replaceLineBreak(original); -// node.text(text); -// d3.select(this).attr("data-html", "true"); + this.parentNode.appendChild(newNode); } }); } -// -//function enableDataHtml() { -// -//} - /* * (Job page only) Helper function to draw edges that cross stage boundaries. * We need to do this manually because we render each stage separately in dagre-d3. @@ -514,18 +488,18 @@ function connectRDDs(fromRDDId, toRDDId, edgesContainer, svgContainer) { edgesContainer.append("path").datum(points).attr("d", line); } -/* replace /n with
*/ +/* + * Replace `/n` with `
` + */ function replaceLineBreak(str) { return str.replace("\\n", "
"); } - /* (Job page only) Helper function to add tooltips for RDDs. */ function addTooltipsForRDDs(svgContainer) { svgContainer.selectAll("g.node").each(function() { var node = d3.select(this); var tooltipText = replaceLineBreak(node.attr("name")); -// var tooltipText = node.attr("name").replace("\\n", "
"); if (tooltipText) { node.select("circle") .attr("data-toggle", "tooltip") From 22861c56a15cad53d728a86cd311df24ab181ce2 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Wed, 18 Jan 2017 23:56:41 -0800 Subject: [PATCH 09/13] [SPARK-17724] more comment --- .../resources/org/apache/spark/ui/static/spark-dag-viz.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 dfb9400449971..790fa945b06b2 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 @@ -363,7 +363,11 @@ function resizeSvg(svg) { .attr("height", height); } - +/* + * Helper function to interprete line break for tag 'tspan'. + * For tag 'tspan', line break '/n' is display in UI as raw for both stage page and job page, + * here this function is to enable line break. + */ function intepreteLineBreak(svg) { var allTSpan = svg.selectAll("tspan").each(function() { node = d3.select(this); @@ -504,7 +508,7 @@ function addTooltipsForRDDs(svgContainer) { node.select("circle") .attr("data-toggle", "tooltip") .attr("data-placement", "bottom") - .attr("data-html", "true") + .attr("data-html", "true") // to interpret line break, tooltipText is showing title .attr("title", tooltipText); } // Link tooltips for all nodes that belong to the same RDD From d1c16e2f17190e6d227a9d062a54ffb75687ce68 Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Thu, 19 Jan 2017 19:14:23 -0800 Subject: [PATCH 10/13] [SPARK-17724] revert unrelated changes --- .../src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 2 +- .../scala/org/apache/spark/ui/jobs/JobProgressListener.scala | 2 +- .../scala/org/apache/spark/ui/scope/RDDOperationGraph.scala | 2 +- core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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..7953d77fd7ece 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) } 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 55cc6a5badbee..83dc5d874589e 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, ListBuffer} +import scala.collection.mutable.{HashMap, HashSet, LinkedHashMap, ListBuffer} import org.apache.spark._ import org.apache.spark.annotation.DeveloperApi 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 b5d41f114c604..0e330879d50f9 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.StorageLevel +import org.apache.spark.storage.{RDDInfo, StorageLevel} /** * A representation of a generic cluster graph used for storing information on RDD operations. 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 ab42e4a5cc1a6..227e940c9c50c 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) } From 2619780630b122eb7d0f65af6b7f1534f59d40db Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Fri, 20 Jan 2017 07:50:35 -0800 Subject: [PATCH 11/13] [SPARK-17724] fix typo interpret --- .../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 790fa945b06b2..e7987dc277cc6 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 @@ -364,7 +364,7 @@ function resizeSvg(svg) { } /* - * Helper function to interprete line break for tag 'tspan'. + * Helper function to interpret line break for tag 'tspan'. * For tag 'tspan', line break '/n' is display in UI as raw for both stage page and job page, * here this function is to enable line break. */ From dfd0bbe8a89f3e88aae31ea999a6ea9389e07b3c Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Fri, 20 Jan 2017 09:56:01 -0800 Subject: [PATCH 12/13] [SPARK-17724] did a global search, fix typo interpret --- .../resources/org/apache/spark/ui/static/spark-dag-viz.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e7987dc277cc6..e45e56a106e1a 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 @@ -173,7 +173,7 @@ function renderDagViz(forJob) { }); resizeSvg(svg); - intepreteLineBreak(svg); + intepretLineBreak(svg); } /* Render the RDD DAG visualization on the stage page. */ @@ -368,7 +368,7 @@ function resizeSvg(svg) { * For tag 'tspan', line break '/n' is display in UI as raw for both stage page and job page, * here this function is to enable line break. */ -function intepreteLineBreak(svg) { +function intepretLineBreak(svg) { var allTSpan = svg.selectAll("tspan").each(function() { node = d3.select(this); var original = node[0][0].innerHTML; From c53db79cfa0d11c100bccec30727123126a782dd Mon Sep 17 00:00:00 2001 From: Xin Ren Date: Fri, 20 Jan 2017 09:57:59 -0800 Subject: [PATCH 13/13] [SPARK-17724] did a global search, fix typo interpret --- .../resources/org/apache/spark/ui/static/spark-dag-viz.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e45e56a106e1a..75b959fdeb59a 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 @@ -173,7 +173,7 @@ function renderDagViz(forJob) { }); resizeSvg(svg); - intepretLineBreak(svg); + interpretLineBreak(svg); } /* Render the RDD DAG visualization on the stage page. */ @@ -368,7 +368,7 @@ function resizeSvg(svg) { * For tag 'tspan', line break '/n' is display in UI as raw for both stage page and job page, * here this function is to enable line break. */ -function intepretLineBreak(svg) { +function interpretLineBreak(svg) { var allTSpan = svg.selectAll("tspan").each(function() { node = d3.select(this); var original = node[0][0].innerHTML;