Enforcing correct sort order for formatted strings
This commit is contained in:
parent
39e2325675
commit
84b7fc54e6
|
@ -90,8 +90,10 @@ private[spark] class IndexPage(parent: MasterWebUI) {
|
||||||
<td>{worker.host}:{worker.port}</td>
|
<td>{worker.host}:{worker.port}</td>
|
||||||
<td>{worker.state}</td>
|
<td>{worker.state}</td>
|
||||||
<td>{worker.cores} ({worker.coresUsed} Used)</td>
|
<td>{worker.cores} ({worker.coresUsed} Used)</td>
|
||||||
<td>{Utils.memoryMegabytesToString(worker.memory)}
|
<td sorttable_customkey={"%s.%s".format(worker.memory, worker.memoryUsed)}>
|
||||||
({Utils.memoryMegabytesToString(worker.memoryUsed)} Used)</td>
|
{Utils.memoryMegabytesToString(worker.memory)}
|
||||||
|
({Utils.memoryMegabytesToString(worker.memoryUsed)} Used)
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,7 +107,9 @@ private[spark] class IndexPage(parent: MasterWebUI) {
|
||||||
<td>
|
<td>
|
||||||
{app.coresGranted}
|
{app.coresGranted}
|
||||||
</td>
|
</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>{DeployWebUI.formatDate(app.submitDate)}</td>
|
||||||
<td>{app.desc.user}</td>
|
<td>{app.desc.user}</td>
|
||||||
<td>{app.state.toString}</td>
|
<td>{app.state.toString}</td>
|
||||||
|
|
|
@ -77,7 +77,9 @@ private[spark] class IndexPage(parent: WorkerWebUI) {
|
||||||
<tr>
|
<tr>
|
||||||
<td>{executor.execId}</td>
|
<td>{executor.execId}</td>
|
||||||
<td>{executor.cores}</td>
|
<td>{executor.cores}</td>
|
||||||
<td>{Utils.memoryMegabytesToString(executor.memory)}</td>
|
<td sorttable_customkey={executor.memory.toString}>
|
||||||
|
{Utils.memoryMegabytesToString(executor.memory)}
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<ul class="unstyled">
|
<ul class="unstyled">
|
||||||
<li><strong>ID:</strong> {executor.appId}</li>
|
<li><strong>ID:</strong> {executor.appId}</li>
|
||||||
|
|
|
@ -93,7 +93,9 @@ private[spark] class StagePage(parent: JobProgressUI) {
|
||||||
val (info, metrics, exception) = taskData
|
val (info, metrics, exception) = taskData
|
||||||
<tr>
|
<tr>
|
||||||
<td>{info.taskId}</td>
|
<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.taskLocality}</td>
|
||||||
<td>{info.hostPort}</td>
|
<td>{info.hostPort}</td>
|
||||||
<td>{dateFmt.format(new Date(info.launchTime))}</td>
|
<td>{dateFmt.format(new Date(info.launchTime))}</td>
|
||||||
|
|
|
@ -81,8 +81,12 @@ private[spark] class RDDPage(parent: BlockManagerUI) {
|
||||||
<td>
|
<td>
|
||||||
{block.storageLevel.description}
|
{block.storageLevel.description}
|
||||||
</td>
|
</td>
|
||||||
<td>{Utils.memoryBytesToString(block.memSize)}</td>
|
<td sorttable_customkey={block.memSize.toString}>
|
||||||
<td>{Utils.memoryBytesToString(block.diskSize)}</td>
|
{Utils.memoryBytesToString(block.memSize)}
|
||||||
|
</td>
|
||||||
|
<td sorttable_customkey={block.diskSize.toString}>
|
||||||
|
{Utils.memoryBytesToString(block.diskSize)}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue