Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@spark.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rxin@apache.org
To: commits@spark.incubator.apache.org
Message-Id: <2df61a355ad14695b079ec94cabebd04@git.apache.org>
Subject: git commit: Merge pull request #111 from kayousterhout/ui_name
Date: Sat, 26 Oct 2013 18:39:37 +0000 (UTC)

Updated Branches:
  refs/heads/branch-0.8 7d4770470 -> 3ec2f51e3


Merge pull request #111 from kayousterhout/ui_name

Properly display the name of a stage in the UI.

This fixes a bug introduced by the fix for SPARK-940, which
changed the UI to display the RDD name rather than the stage
name. As a result, no name for the stage was shown when
using the Spark shell, which meant that there was no way to
click on the stage to see more details (e.g., the running
tasks). This commit changes the UI back to using the
stage name.

@pwendell -- let me know if this change was intentional

(cherry picked from commit 85e2cab6f68cbcb66bb348298463e2e86591d92d)
Signed-off-by: Reynold Xin <rxin@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/3ec2f51e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/3ec2f51e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/3ec2f51e

Branch: refs/heads/branch-0.8
Commit: 3ec2f51e3459503950f9678692706d2707a33a92
Parents: 7d47704
Author: Matei Zaharia <matei@eecs.berkeley.edu>
Authored: Fri Oct 25 14:46:06 2013 -0700
Committer: Reynold Xin <rxin@apache.org>
Committed: Sat Oct 26 11:39:29 2013 -0700

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala | 2 --
 core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/3ec2f51e/core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala b/core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala
index 37bb089..93599df 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala
@@ -33,6 +33,4 @@ class StageInfo(
   val name = stage.name
   val numPartitions = stage.numPartitions
   val numTasks = stage.numTasks
-
-  override def toString = rddName
 }

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/3ec2f51e/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 2c29ea7..d7d0441 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
@@ -99,7 +99,7 @@ private[spark] class StageTable(val stages: Seq[StageInfo], val parent: JobProgr
     val poolName = listener.stageIdToPool.get(s.stageId)
 
     val nameLink =
-      <a href={"%s/stages/stage?id=%s".format(UIUtils.prependBaseUri(),s.stageId)}>{s.toString}</a>
+      <a href={"%s/stages/stage?id=%s".format(UIUtils.prependBaseUri(),s.stageId)}>{s.name}</a>
     val description = listener.stageIdToDescription.get(s.stageId)
       .map(d => <div><em>{d}</em></div><div>{nameLink}</div>).getOrElse(nameLink)
     val finishTime = s.completionTime.getOrElse(System.currentTimeMillis())