You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2017/06/07 09:18:49 UTC
spark git commit: [SPARK-20966][WEB-UI][SQL] Table data is not sorted
by startTime time desc,
time is not formatted and redundant code in JDBC/ODBC Server page.
Repository: spark
Updated Branches:
refs/heads/master 3218505a0 -> 0ca69c4cc
[SPARK-20966][WEB-UI][SQL] Table data is not sorted by startTime time desc, time is not formatted and redundant code in JDBC/ODBC Server page.
## What changes were proposed in this pull request?
1. Question 1 : Table data is not sorted by startTime time desc in JDBC/ODBC Server page.
fix before :
fix after :
2. Question 2 : time is not formatted in JDBC/ODBC Server page.
fix before :
fix after :
3. Question 3 : Redundant code in the ThriftServerSessionPage.scala.
The function of 'generateSessionStatsTable' has not been used
## How was this patch tested?
manual tests
Please review http://spark.apache.org/contributing.html before opening a pull request.
Author: guoxiaolong <gu...@zte.com.cn>
Author: 郭小龙 10207633 <gu...@zte.com.cn>
Author: guoxiaolongzte <gu...@zte.com.cn>
Closes #18186 from guoxiaolongzte/SPARK-20966.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0ca69c4c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0ca69c4c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0ca69c4c
Branch: refs/heads/master
Commit: 0ca69c4ccf9cd5934d9c73d15c0224342385d333
Parents: 3218505
Author: guoxiaolong <gu...@zte.com.cn>
Authored: Wed Jun 7 10:18:40 2017 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Wed Jun 7 10:18:40 2017 +0100
----------------------------------------------------------------------
.../hive/thriftserver/ui/ThriftServerPage.scala | 4 +--
.../ui/ThriftServerSessionPage.scala | 38 +-------------------
2 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0ca69c4c/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
index 2e0fa1e..17589cf 100644
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
@@ -72,7 +72,7 @@ private[ui] class ThriftServerPage(parent: ThriftServerTab) extends WebUIPage(""
val table = if (numStatement > 0) {
val headerRow = Seq("User", "JobID", "GroupID", "Start Time", "Finish Time", "Duration",
"Statement", "State", "Detail")
- val dataRows = listener.getExecutionList
+ val dataRows = listener.getExecutionList.sortBy(_.startTimestamp).reverse
def generateDataRow(info: ExecutionInfo): Seq[Node] = {
val jobLink = info.jobId.map { id: String =>
@@ -142,7 +142,7 @@ private[ui] class ThriftServerPage(parent: ThriftServerTab) extends WebUIPage(""
val sessionList = listener.getSessionList
val numBatches = sessionList.size
val table = if (numBatches > 0) {
- val dataRows = sessionList
+ val dataRows = sessionList.sortBy(_.startTimestamp).reverse
val headerRow = Seq("User", "IP", "Session ID", "Start Time", "Finish Time", "Duration",
"Total Execute")
def generateDataRow(session: SessionInfo): Seq[Node] = {
http://git-wip-us.apache.org/repos/asf/spark/blob/0ca69c4c/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
index 38b8605..5cd2fdf 100644
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
@@ -66,7 +66,7 @@ private[ui] class ThriftServerSessionPage(parent: ThriftServerTab)
val timeSinceStart = System.currentTimeMillis() - startTime.getTime
<ul class ="unstyled">
<li>
- <strong>Started at: </strong> {startTime.toString}
+ <strong>Started at: </strong> {formatDate(startTime)}
</li>
<li>
<strong>Time since start: </strong>{formatDurationVerbose(timeSinceStart)}
@@ -147,42 +147,6 @@ private[ui] class ThriftServerSessionPage(parent: ThriftServerTab)
<td>{errorSummary}{details}</td>
}
- /** Generate stats of batch sessions of the thrift server program */
- private def generateSessionStatsTable(): Seq[Node] = {
- val sessionList = listener.getSessionList
- val numBatches = sessionList.size
- val table = if (numBatches > 0) {
- val dataRows =
- sessionList.sortBy(_.startTimestamp).reverse.map ( session =>
- Seq(
- session.userName,
- session.ip,
- session.sessionId,
- formatDate(session.startTimestamp),
- formatDate(session.finishTimestamp),
- formatDurationOption(Some(session.totalTime)),
- session.totalExecution.toString
- )
- ).toSeq
- val headerRow = Seq("User", "IP", "Session ID", "Start Time", "Finish Time", "Duration",
- "Total Execute")
- Some(listingTable(headerRow, dataRows))
- } else {
- None
- }
-
- val content =
- <h5>Session Statistics</h5> ++
- <div>
- <ul class="unstyled">
- {table.getOrElse("No statistics have been generated yet.")}
- </ul>
- </div>
-
- content
- }
-
-
/**
* Returns a human-readable string representing a duration such as "5 second 35 ms"
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org