From 956f61f0bab0a40c8fa3734aaab3955e8b4945fa Mon Sep 17 00:00:00 2001
From: uncleGen <hustyugm@gmail.com>
Date: Wed, 15 May 2019 14:06:03 +0800
Subject: [PATCH 1/4] SQL query details in UI dose not show in correct format.

---
 .../org/apache/spark/sql/execution/ui/AllExecutionsPage.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
index 824c094220e82..461c04d2d8495 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
@@ -388,7 +388,7 @@ private[ui] class ExecutionPagedTable(
         +details
       </span> ++
       <div class="stage-details collapsed">
-        <pre>{execution.description}<br></br>{execution.details}</pre>
+        <pre>{Unparsed(execution.description)}<br></br>{execution.details}</pre>
       </div>
     } else {
       Nil

From 1f6c366a7142e8f212738480274864f1e4bda3e0 Mon Sep 17 00:00:00 2001
From: uncleGen <hustyugm@gmail.com>
Date: Thu, 16 May 2019 15:33:01 +0800
Subject: [PATCH 2/4] address comment

---
 .../org/apache/spark/sql/execution/ui/AllExecutionsPage.scala  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
index 461c04d2d8495..7b336d248f7cb 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
@@ -382,13 +382,14 @@ private[ui] class ExecutionPagedTable(
   }
 
   private def descriptionCell(execution: SQLExecutionUIData): Seq[Node] = {
+    val jobDescription = UIUtils.makeDescription(execution.description, basePath, plainText = false)
     val details = if (execution.details != null && execution.details.nonEmpty) {
       <span onclick="this.parentNode.querySelector('.stage-details').classList.toggle('collapsed')"
             class="expand-details">
         +details
       </span> ++
       <div class="stage-details collapsed">
-        <pre>{Unparsed(execution.description)}<br></br>{execution.details}</pre>
+        <pre>{jobDescription}<br></br>{execution.details}</pre>
       </div>
     } else {
       Nil

From ca1a1f787ea17aebeb0910e39c24b44268126bb7 Mon Sep 17 00:00:00 2001
From: uncleGen <hustyugm@gmail.com>
Date: Fri, 17 May 2019 10:01:50 +0800
Subject: [PATCH 3/4] fix comments

---
 .../org/apache/spark/sql/execution/ui/AllExecutionsPage.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
index 7b336d248f7cb..5ca41f6f3f09d 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
@@ -382,14 +382,14 @@ private[ui] class ExecutionPagedTable(
   }
 
   private def descriptionCell(execution: SQLExecutionUIData): Seq[Node] = {
-    val jobDescription = UIUtils.makeDescription(execution.description, basePath, plainText = false)
+    val executionDesc = UIUtils.makeDescription(execution.description, basePath, plainText = false)
     val details = if (execution.details != null && execution.details.nonEmpty) {
       <span onclick="this.parentNode.querySelector('.stage-details').classList.toggle('collapsed')"
             class="expand-details">
         +details
       </span> ++
       <div class="stage-details collapsed">
-        <pre>{jobDescription}<br></br>{execution.details}</pre>
+        <pre>{executionDesc}<br></br>{execution.details}</pre>
       </div>
     } else {
       Nil

From 47eb0f454efe35b31ae288611ece5822aa09ece1 Mon Sep 17 00:00:00 2001
From: uncleGen <hustyugm@gmail.com>
Date: Wed, 25 Sep 2019 19:43:02 +0800
Subject: [PATCH 4/4] remove the 'br'

---
 .../spark/sql/execution/streaming/StreamExecution.scala     | 6 ++++--
 .../apache/spark/sql/execution/ui/AllExecutionsPage.scala   | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamExecution.scala
index debf1fad57308..f470ad3f9c690 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamExecution.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/StreamExecution.scala
@@ -578,8 +578,10 @@ abstract class StreamExecution(
 
   protected def getBatchDescriptionString: String = {
     val batchDescription = if (currentBatchId < 0) "init" else currentBatchId.toString
-    Option(name).map(_ + "<br/>").getOrElse("") +
-      s"id = $id<br/>runId = $runId<br/>batch = $batchDescription"
+    s"""|${Option(name).getOrElse("")}
+        |id = $id
+        |runId = $runId
+        |batch = $batchDescription""".stripMargin
   }
 
   protected def createStreamingWrite(
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
index 2066c31d4945a..ec0577283265d 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
@@ -383,14 +383,13 @@ private[ui] class ExecutionPagedTable(
   }
 
   private def descriptionCell(execution: SQLExecutionUIData): Seq[Node] = {
-    val executionDesc = UIUtils.makeDescription(execution.description, basePath, plainText = false)
     val details = if (execution.details != null && execution.details.nonEmpty) {
       <span onclick="this.parentNode.querySelector('.stage-details').classList.toggle('collapsed')"
             class="expand-details">
         +details
       </span> ++
       <div class="stage-details collapsed">
-        <pre>{executionDesc}<br></br>{execution.details}</pre>
+        <pre>{execution.description}<br></br>{execution.details}</pre>
       </div>
     } else {
       Nil