Repository: spark
Updated Branches:
  refs/heads/branch-2.2 42852bb17 -> 309c401a5


[SPARK-21953] Show both memory and disk bytes spilled if either is present

As written now, there must be both memory and disk bytes spilled to show either 
of them. If there is only one of those types of spill recorded, it will be 
hidden.

Author: Andrew Ash <and...@andrewash.com>

Closes #19164 from ash211/patch-3.

(cherry picked from commit 6308c65f08b507408033da1f1658144ea8c1491f)
Signed-off-by: Wenchen Fan <wenc...@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/309c401a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/309c401a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/309c401a

Branch: refs/heads/branch-2.2
Commit: 309c401a5b3c76cc1b6b5aef97d03034fe4e1ce4
Parents: 42852bb
Author: Andrew Ash <and...@andrewash.com>
Authored: Mon Sep 18 10:42:24 2017 +0800
Committer: Wenchen Fan <wenc...@databricks.com>
Committed: Mon Sep 18 10:42:41 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/spark/blob/309c401a/core/src/main/scala/org/apache/spark/ui/jobs/UIData.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/UIData.scala 
b/core/src/main/scala/org/apache/spark/ui/jobs/UIData.scala
index 8bedd07..25aa504 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/UIData.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/UIData.scala
@@ -108,7 +108,7 @@ private[spark] object UIData {
     def hasOutput: Boolean = outputBytes > 0
     def hasShuffleRead: Boolean = shuffleReadTotalBytes > 0
     def hasShuffleWrite: Boolean = shuffleWriteBytes > 0
-    def hasBytesSpilled: Boolean = memoryBytesSpilled > 0 && diskBytesSpilled 
> 0
+    def hasBytesSpilled: Boolean = memoryBytesSpilled > 0 || diskBytesSpilled 
> 0
   }
 
   /**


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to