Repository: spark Updated Branches: refs/heads/master b8f4379ba -> e62820c85
[SPARK-6541] Sort executors by ID (numeric) "Force" the executor ID sort with Int. Author: Jean-Baptiste Onofré <[email protected]> Closes #9165 from jbonofre/SPARK-6541. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e62820c8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e62820c8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e62820c8 Branch: refs/heads/master Commit: e62820c85fe02c70f9ed51b2e68d41ff8cfecd40 Parents: b8f4379 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Nov 18 08:57:58 2015 +0000 Committer: Sean Owen <[email protected]> Committed: Wed Nov 18 08:57:58 2015 +0000 ---------------------------------------------------------------------- .../resources/org/apache/spark/ui/static/sorttable.js | 2 +- .../scala/org/apache/spark/ui/jobs/ExecutorTable.scala | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e62820c8/core/src/main/resources/org/apache/spark/ui/static/sorttable.js ---------------------------------------------------------------------- diff --git a/core/src/main/resources/org/apache/spark/ui/static/sorttable.js b/core/src/main/resources/org/apache/spark/ui/static/sorttable.js index dde6069..a73d9a5 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/sorttable.js +++ b/core/src/main/resources/org/apache/spark/ui/static/sorttable.js @@ -89,7 +89,7 @@ sorttable = { // make it clickable to sort headrow[i].sorttable_columnindex = i; headrow[i].sorttable_tbody = table.tBodies[0]; - dean_addEvent(headrow[i],"click", function(e) { + dean_addEvent(headrow[i],"click", sorttable.innerSortFunction = function(e) { if (this.className.search(/\bsorttable_sorted\b/) != -1) { // if we're already sorted by this column, just http://git-wip-us.apache.org/repos/asf/spark/blob/e62820c8/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 be144f6..1268f44 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 @@ -18,7 +18,7 @@ package org.apache.spark.ui.jobs import scala.collection.mutable -import scala.xml.Node +import scala.xml.{Unparsed, Node} import org.apache.spark.ui.{ToolTips, UIUtils} import org.apache.spark.ui.jobs.UIData.StageUIData @@ -52,7 +52,7 @@ private[ui] class ExecutorTable(stageId: Int, stageAttemptId: Int, parent: Stage <table class={UIUtils.TABLE_CLASS_STRIPED_SORTABLE}> <thead> - <th>Executor ID</th> + <th id="executorid">Executor ID</th> <th>Address</th> <th>Task Time</th> <th>Total Tasks</th> @@ -89,6 +89,15 @@ private[ui] class ExecutorTable(stageId: Int, stageAttemptId: Int, parent: Stage {createExecutorTable()} </tbody> </table> + <script> + {Unparsed { + """ + | window.onload = function() { + | sorttable.innerSortFunction.apply(document.getElementById('executorid'), []) + | }; + """.stripMargin + }} + </script> } private def createExecutorTable() : Seq[Node] = { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
