diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-07-05 17:21:01 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-07-05 17:21:08 -0700 |
| commit | 84b7fc54e6777167f96742cd61326581f342fb03 (patch) | |
| tree | d89b3cede71f524df2f7b4eb000f2f5d410dd047 /core | |
| parent | 39e2325675e40c2231e26a7e693035f54039b1d5 (diff) | |
| download | spark-84b7fc54e6777167f96742cd61326581f342fb03.tar.gz spark-84b7fc54e6777167f96742cd61326581f342fb03.tar.bz2 spark-84b7fc54e6777167f96742cd61326581f342fb03.zip | |
Enforcing correct sort order for formatted strings
Diffstat (limited to 'core')
4 files changed, 19 insertions, 7 deletions
diff --git a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala index 2ed566a5bc..c6de2bafa3 100644 --- a/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala +++ b/core/src/main/scala/spark/deploy/master/ui/IndexPage.scala @@ -90,8 +90,10 @@ private[spark] class IndexPage(parent: MasterWebUI) { <td>{worker.host}:{worker.port}</td> <td>{worker.state}</td> <td>{worker.cores} ({worker.coresUsed} Used)</td> - <td>{Utils.memoryMegabytesToString(worker.memory)} - ({Utils.memoryMegabytesToString(worker.memoryUsed)} Used)</td> + <td sorttable_customkey={"%s.%s".format(worker.memory, worker.memoryUsed)}> + {Utils.memoryMegabytesToString(worker.memory)} + ({Utils.memoryMegabytesToString(worker.memoryUsed)} Used) + </td> </tr> } @@ -105,7 +107,9 @@ private[spark] class IndexPage(parent: MasterWebUI) { <td> {app.coresGranted} </td> - <td>{Utils.memoryMegabytesToString(app.desc.memoryPerSlave)}</td> + <td sorttable_customkey={app.desc.memoryPerSlave.toString}> + {Utils.memoryMegabytesToString(app.desc.memoryPerSlave)} + </td> <td>{DeployWebUI.formatDate(app.submitDate)}</td> <td>{app.desc.user}</td> <td>{app.state.toString}</td> diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala index c65d5b4faf..e466129c1a 100644 --- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala +++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala @@ -77,7 +77,9 @@ private[spark] class IndexPage(parent: WorkerWebUI) { <tr> <td>{executor.execId}</td> <td>{executor.cores}</td> - <td>{Utils.memoryMegabytesToString(executor.memory)}</td> + <td sorttable_customkey={executor.memory.toString}> + {Utils.memoryMegabytesToString(executor.memory)} + </td> <td> <ul class="unstyled"> <li><strong>ID:</strong> {executor.appId}</li> diff --git a/core/src/main/scala/spark/ui/jobs/StagePage.scala b/core/src/main/scala/spark/ui/jobs/StagePage.scala index c6f87fc652..49e84880cf 100644 --- a/core/src/main/scala/spark/ui/jobs/StagePage.scala +++ b/core/src/main/scala/spark/ui/jobs/StagePage.scala @@ -93,7 +93,9 @@ private[spark] class StagePage(parent: JobProgressUI) { val (info, metrics, exception) = taskData <tr> <td>{info.taskId}</td> - <td>{Option(metrics).map{m => parent.formatDuration(m.executorRunTime)}.getOrElse("")}</td> + <td sorttable_customkey={Option(metrics).map{m => m.executorRunTime.toString}.getOrElse("1")}> + {Option(metrics).map{m => parent.formatDuration(m.executorRunTime)}.getOrElse("")} + </td> <td>{info.taskLocality}</td> <td>{info.hostPort}</td> <td>{dateFmt.format(new Date(info.launchTime))}</td> diff --git a/core/src/main/scala/spark/ui/storage/RDDPage.scala b/core/src/main/scala/spark/ui/storage/RDDPage.scala index 65952f711a..0cb1e47ea5 100644 --- a/core/src/main/scala/spark/ui/storage/RDDPage.scala +++ b/core/src/main/scala/spark/ui/storage/RDDPage.scala @@ -81,8 +81,12 @@ private[spark] class RDDPage(parent: BlockManagerUI) { <td> {block.storageLevel.description} </td> - <td>{Utils.memoryBytesToString(block.memSize)}</td> - <td>{Utils.memoryBytesToString(block.diskSize)}</td> + <td sorttable_customkey={block.memSize.toString}> + {Utils.memoryBytesToString(block.memSize)} + </td> + <td sorttable_customkey={block.diskSize.toString}> + {Utils.memoryBytesToString(block.diskSize)} + </td> </tr> } |