ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SAPRK-20785][WEB-UI][SQL] Spark should provide jump links and add (count) in the SQL web ui.

Browse source 
## What changes were proposed in this pull request?

propose:

it provide links that jump to Running Queries,Completed Queries and Failed Queries.
it add (count) about Running Queries,Completed Queries and Failed Queries.
This is a small optimization in in the SQL web ui.

fix before:

![1](https://user-images.githubusercontent.com/26266482/30840686-36025cc0-a2ab-11e7-8d8d-1de0122a84fb.png)

fix after:
![2](https://user-images.githubusercontent.com/26266482/30840723-6cc67a52-a2ab-11e7-8002-9191a55895a6.png)

## How was this patch tested?

manual tests

Please review http://spark.apache.org/contributing.html before opening a pull request.

Author: guoxiaolong <guo.xiaolong1@zte.com.cn>

Closes #19346 from guoxiaolongzte/SPARK-20785.
This commit is contained in:
guoxiaolong 2017-09-27 20:48:55 +08:00 committed by jerryshao
parent 74daf622de
commit d2b8b63b93
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
View file

@ -20,7 +20,7 @@ package org.apache.spark.sql.execution.ui
import javax.servlet.http.HttpServletRequest
import scala.collection.mutable
import scala.xml.Node
import scala.xml.{Node, NodeSeq}
import org.apache.commons.lang3.StringEscapeUtils
@ -38,19 +38,19 @@ private[ui] class AllExecutionsPage(parent: SQLTab) extends WebUIPage("") with L
if (listener.getRunningExecutions.nonEmpty) {
_content ++=
new RunningExecutionTable(
parent, "Running Queries", currentTime,
parent, s"Running Queries (${listener.getRunningExecutions.size})", currentTime,
listener.getRunningExecutions.sortBy(_.submissionTime).reverse).toNodeSeq
}
if (listener.getCompletedExecutions.nonEmpty) {
_content ++=
new CompletedExecutionTable(
parent, "Completed Queries", currentTime,
parent, s"Completed Queries (${listener.getCompletedExecutions.size})", currentTime,
listener.getCompletedExecutions.sortBy(_.submissionTime).reverse).toNodeSeq
}
if (listener.getFailedExecutions.nonEmpty) {
_content ++=
new FailedExecutionTable(
parent, "Failed Queries", currentTime,
parent, s"Failed Queries (${listener.getFailedExecutions.size})", currentTime,
listener.getFailedExecutions.sortBy(_.submissionTime).reverse).toNodeSeq
}
_content
@ -61,7 +61,36 @@ private[ui] class AllExecutionsPage(parent: SQLTab) extends WebUIPage("") with L
details.parentNode.querySelector('.stage-details').classList.toggle('collapsed')
}}
</script>
UIUtils.headerSparkPage("SQL", content, parent, Some(5000))
val summary: NodeSeq =
<div>
<ul class="unstyled">
{
if (listener.getRunningExecutions.nonEmpty) {
<li>
<a href="#running-execution-table"><strong>Running Queries:</strong></a>
{listener.getRunningExecutions.size}
</li>
}
}
{
if (listener.getCompletedExecutions.nonEmpty) {
<li>
<a href="#completed-execution-table"><strong>Completed Queries:</strong></a>
{listener.getCompletedExecutions.size}
</li>
}
}
{
if (listener.getFailedExecutions.nonEmpty) {
<li>
<a href="#failed-execution-table"><strong>Failed Queries:</strong></a>
{listener.getFailedExecutions.size}
</li>
}
}
</ul>
</div>
UIUtils.headerSparkPage("SQL", summary ++ content, parent, Some(5000))
}
}