Skip to content

Commit

Permalink
Wording changes per Patrick
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewor14 committed Jan 14, 2014
1 parent a1f0992 commit 8399341
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ private[spark] class ExecutorTable(val parent: JobProgressUI, val stageId: Int)
<th>Succeeded Tasks</th>
<th>Shuffle Read</th>
<th>Shuffle Write</th>
<th>Bytes Spilled (Memory)</th>
<th>Bytes Spilled (Disk)</th>
<th>Shuffle Spill (Memory)</th>
<th>Shuffle Spill (Disk)</th>
</thead>
<tbody>
{createExecutorTable()}
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ private[spark] class StagePage(parent: JobProgressUI) {
}
{if (hasBytesSpilled)
<li>
<strong>Bytes spilled (memory): </strong>
<strong>Shuffle spill (memory): </strong>
{Utils.bytesToString(memoryBytesSpilled)}
</li>
<li>
<strong>Bytes spilled (disk): </strong>
<strong>Shuffle spill (disk): </strong>
{Utils.bytesToString(diskBytesSpilled)}
</li>
}
Expand All @@ -102,7 +102,7 @@ private[spark] class StagePage(parent: JobProgressUI) {
Seq("Duration", "GC Time", "Result Ser Time") ++
{if (hasShuffleRead) Seq("Shuffle Read") else Nil} ++
{if (hasShuffleWrite) Seq("Write Time", "Shuffle Write") else Nil} ++
{if (hasBytesSpilled) Seq("Bytes Spilled (Memory)", "Bytes Spilled (Disk)") else Nil} ++
{if (hasBytesSpilled) Seq("Shuffle Spill (Memory)", "Shuffle Spill (Disk)") else Nil} ++
Seq("Errors")

val taskTable = listingTable(taskHeaders, taskRow(hasShuffleRead, hasShuffleWrite, hasBytesSpilled), tasks)
Expand Down Expand Up @@ -171,14 +171,14 @@ private[spark] class StagePage(parent: JobProgressUI) {
case(info, metrics, exception) =>
metrics.get.memoryBytesSpilled.toDouble
}
val memoryBytesSpilledQuantiles = "Bytes spilled (memory)" +:
val memoryBytesSpilledQuantiles = "Shuffle spill (memory)" +:
getQuantileCols(memoryBytesSpilledSizes)

val diskBytesSpilledSizes = validTasks.map {
case(info, metrics, exception) =>
metrics.get.diskBytesSpilled.toDouble
}
val diskBytesSpilledQuantiles = "Bytes spilled (disk)" +:
val diskBytesSpilledQuantiles = "Shuffle spill (disk)" +:
getQuantileCols(diskBytesSpilledSizes)

val listings: Seq[Seq[String]] = Seq(
Expand Down

0 comments on commit 8399341

Please sign in to comment.