Repository: spark Updated Branches: refs/heads/branch-1.1 0e3257906 -> a36116c19
[SPARK-3905][Web UI]The keys for sorting the columns of Executor page ,Stage page Storage page are incorrect Author: GuoQiang Li <wi...@qq.com> Closes #2763 from witgo/SPARK-3905 and squashes the following commits: 17d7990 [GuoQiang Li] The keys for sorting the columns of Executor page ,Stage page Storage page are incorrect (cherry picked from commit b4a7fa7a663c462bf537ca9d63af0dba6b4a8033) Signed-off-by: Josh Rosen <joshro...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a36116c1 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a36116c1 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a36116c1 Branch: refs/heads/branch-1.1 Commit: a36116c190047c0b8b1e12d1686235dca1b77fc0 Parents: 0e32579 Author: GuoQiang Li <wi...@qq.com> Authored: Sun Oct 12 22:48:54 2014 -0700 Committer: Josh Rosen <joshro...@apache.org> Committed: Sun Oct 12 22:49:12 2014 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/ui/jobs/ExecutorTable.scala | 12 ++++++------ .../scala/org/apache/spark/ui/jobs/StageTable.scala | 6 +++--- .../scala/org/apache/spark/ui/storage/StoragePage.scala | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a36116c1/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala index 2987dc0..f0e43fb 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala @@ -71,19 +71,19 @@ private[ui] class ExecutorTable(stageId: Int, stageAttemptId: Int, parent: JobPr <tr> <td>{k}</td> <td>{executorIdToAddress.getOrElse(k, "CANNOT FIND ADDRESS")}</td> - <td sorttable_customekey={v.taskTime.toString}>{UIUtils.formatDuration(v.taskTime)}</td> + <td sorttable_customkey={v.taskTime.toString}>{UIUtils.formatDuration(v.taskTime)}</td> <td>{v.failedTasks + v.succeededTasks}</td> <td>{v.failedTasks}</td> <td>{v.succeededTasks}</td> - <td sorttable_customekey={v.inputBytes.toString}> + <td sorttable_customkey={v.inputBytes.toString}> {Utils.bytesToString(v.inputBytes)}</td> - <td sorttable_customekey={v.shuffleRead.toString}> + <td sorttable_customkey={v.shuffleRead.toString}> {Utils.bytesToString(v.shuffleRead)}</td> - <td sorttable_customekey={v.shuffleWrite.toString}> + <td sorttable_customkey={v.shuffleWrite.toString}> {Utils.bytesToString(v.shuffleWrite)}</td> - <td sorttable_customekey={v.memoryBytesSpilled.toString}> + <td sorttable_customkey={v.memoryBytesSpilled.toString}> {Utils.bytesToString(v.memoryBytesSpilled)}</td> - <td sorttable_customekey={v.diskBytesSpilled.toString}> + <td sorttable_customkey={v.diskBytesSpilled.toString}> {Utils.bytesToString(v.diskBytesSpilled)}</td> </tr> } http://git-wip-us.apache.org/repos/asf/spark/blob/a36116c1/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala ---------------------------------------------------------------------- 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 2e67310..4ee7f08 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 @@ -176,9 +176,9 @@ private[ui] class StageTableBase( {makeProgressBar(stageData.numActiveTasks, stageData.completedIndices.size, stageData.numFailedTasks, s.numTasks)} </td> - <td sorttable_customekey={inputRead.toString}>{inputReadWithUnit}</td> - <td sorttable_customekey={shuffleRead.toString}>{shuffleReadWithUnit}</td> - <td sorttable_customekey={shuffleWrite.toString}>{shuffleWriteWithUnit}</td> + <td sorttable_customkey={inputRead.toString}>{inputReadWithUnit}</td> + <td sorttable_customkey={shuffleRead.toString}>{shuffleReadWithUnit}</td> + <td sorttable_customkey={shuffleWrite.toString}>{shuffleWriteWithUnit}</td> } /** Render an HTML row that represents a stage */ http://git-wip-us.apache.org/repos/asf/spark/blob/a36116c1/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala index 716591c..83489ca 100644 --- a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala +++ b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala @@ -58,9 +58,9 @@ private[ui] class StoragePage(parent: StorageTab) extends WebUIPage("") { </td> <td>{rdd.numCachedPartitions}</td> <td>{"%.0f%%".format(rdd.numCachedPartitions * 100.0 / rdd.numPartitions)}</td> - <td sorttable_customekey={rdd.memSize.toString}>{Utils.bytesToString(rdd.memSize)}</td> - <td sorttable_customekey={rdd.tachyonSize.toString}>{Utils.bytesToString(rdd.tachyonSize)}</td> - <td sorttable_customekey={rdd.diskSize.toString} >{Utils.bytesToString(rdd.diskSize)}</td> + <td sorttable_customkey={rdd.memSize.toString}>{Utils.bytesToString(rdd.memSize)}</td> + <td sorttable_customkey={rdd.tachyonSize.toString}>{Utils.bytesToString(rdd.tachyonSize)}</td> + <td sorttable_customkey={rdd.diskSize.toString} >{Utils.bytesToString(rdd.diskSize)}</td> </tr> // scalastyle:on } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
