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

ash211 · web-flow · commit 7852abeaa22c · 2017-09-08T00:48:54.000-07:00
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
@@ -109,7 +109,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
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private[spark] object UIData {`
`109`	`109`	`def hasOutput: Boolean = outputBytes > 0`
`110`	`110`	`def hasShuffleRead: Boolean = shuffleReadTotalBytes > 0`
`111`	`111`	`def hasShuffleWrite: Boolean = shuffleWriteBytes > 0`
`112`		`- def hasBytesSpilled: Boolean = memoryBytesSpilled > 0 && diskBytesSpilled > 0`
	`112`	`+ def hasBytesSpilled: Boolean = memoryBytesSpilled > 0 \|\| diskBytesSpilled > 0`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`