From f20701e50e267a3a21ace3bbb3ec9d019eb45f04 Mon Sep 17 00:00:00 2001
From: "shiyun.wxm" <shiyun.wxm@taobao.com>
Date: Tue, 18 Mar 2014 21:56:46 +0800
Subject: [PATCH 1/4] bugfix: "Duration" in "Active Stages" in stages page

---
 core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
index c5fd3ae16dc9..38d63b404bd7 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
@@ -106,7 +106,7 @@ private[spark] class StageTable(val stages: Seq[StageInfo], val parent: JobProgr
     val description = listener.stageIdToDescription.get(s.stageId)
       .map(d => <div><em>{d}</em></div><div>{nameLink}</div>).getOrElse(nameLink)
     val finishTime = s.completionTime.getOrElse(System.currentTimeMillis())
-    val duration =  s.submissionTime.map(t => finishTime - t)
+    val duration =  s.submissionTime.map(t => if(finishTime > t) finishTime - t else System.currentTimeMillis() - t)
 
     <tr>
       <td>{s.stageId}</td>

From 3b072e1a0029940ec72e0e6cb978569025b933d3 Mon Sep 17 00:00:00 2001
From: "shiyun.wxm" <shiyun.wxm@taobao.com>
Date: Wed, 19 Mar 2014 00:48:50 +0800
Subject: [PATCH 2/4] fix scala style

---
 .../main/scala/org/apache/spark/ui/jobs/StageTable.scala | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
index 38d63b404bd7..70cd105f3ccc 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
@@ -106,7 +106,14 @@ private[spark] class StageTable(val stages: Seq[StageInfo], val parent: JobProgr
     val description = listener.stageIdToDescription.get(s.stageId)
       .map(d => <div><em>{d}</em></div><div>{nameLink}</div>).getOrElse(nameLink)
     val finishTime = s.completionTime.getOrElse(System.currentTimeMillis())
-    val duration =  s.submissionTime.map(t => if(finishTime > t) finishTime - t else System.currentTimeMillis() - t)
+    val duration = s.submissionTime.map {
+      case t =>
+        if (finishTime > t) {
+          finishTime - t
+        } else {
+          System.currentTimeMillis() - t
+        }
+    }
 
     <tr>
       <td>{s.stageId}</td>

From c0d7b24a9dda592437c0ba950f842499f35d941f Mon Sep 17 00:00:00 2001
From: "shiyun.wxm" <shiyun.wxm@taobao.com>
Date: Wed, 19 Mar 2014 09:38:35 +0800
Subject: [PATCH 3/4] change the style

---
 .../main/scala/org/apache/spark/ui/jobs/StageTable.scala | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
index 70cd105f3ccc..73852648478d 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
@@ -106,13 +106,8 @@ private[spark] class StageTable(val stages: Seq[StageInfo], val parent: JobProgr
     val description = listener.stageIdToDescription.get(s.stageId)
       .map(d => <div><em>{d}</em></div><div>{nameLink}</div>).getOrElse(nameLink)
     val finishTime = s.completionTime.getOrElse(System.currentTimeMillis())
-    val duration = s.submissionTime.map {
-      case t =>
-        if (finishTime > t) {
-          finishTime - t
-        } else {
-          System.currentTimeMillis() - t
-        }
+    val duration = s.submissionTime.map { t =>
+        if (finishTime > t) finishTime - t else System.currentTimeMillis - t
     }
 
     <tr>

From a86d261cc327880ce7e3ab078b27572eeced6553 Mon Sep 17 00:00:00 2001
From: "shiyun.wxm" <shiyun.wxm@taobao.com>
Date: Wed, 19 Mar 2014 13:02:04 +0800
Subject: [PATCH 4/4] tow space indent

---
 core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
index 73852648478d..99828487f190 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
@@ -107,7 +107,7 @@ private[spark] class StageTable(val stages: Seq[StageInfo], val parent: JobProgr
       .map(d => <div><em>{d}</em></div><div>{nameLink}</div>).getOrElse(nameLink)
     val finishTime = s.completionTime.getOrElse(System.currentTimeMillis())
     val duration = s.submissionTime.map { t =>
-        if (finishTime > t) finishTime - t else System.currentTimeMillis - t
+      if (finishTime > t) finishTime - t else System.currentTimeMillis - t
     }
 
     <tr>