diff options
| author | Cheng Lian <lian.cs.zju@gmail.com> | 2014-07-27 12:35:21 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-07-27 12:35:21 -0700 |
| commit | 2bbf235376f40a4b95d7e6e42e1bed893c124ecb (patch) | |
| tree | b7764a682cde3bf49788e72d8d0c26c2b0cddab7 | |
| parent | 985705301e5e55de14b00ad8ce3143e91aae185d (diff) | |
| download | spark-2bbf235376f40a4b95d7e6e42e1bed893c124ecb.tar.gz spark-2bbf235376f40a4b95d7e6e42e1bed893c124ecb.tar.bz2 spark-2bbf235376f40a4b95d7e6e42e1bed893c124ecb.zip | |
[SPARK-2705][CORE] Fixed stage description in stage info page
Stage description should be a `String`, but was changed to an `Option[String]` by mistake:
Author: Cheng Lian <lian.cs.zju@gmail.com>
Closes #1524 from liancheng/fix-stage-desc and squashes the following commits:
3c69327 [Cheng Lian] Fixed stage description object type in Web UI stage table
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala | 14 |
1 files changed, 7 insertions, 7 deletions
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 f8b308c981..3dcfaf76e4 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 @@ -119,14 +119,14 @@ private[ui] class StageTableBase( </div> } - val stageDataOption = listener.stageIdToData.get(s.stageId) - // Too many nested map/flatMaps with options are just annoying to read. Do this imperatively. - if (stageDataOption.isDefined && stageDataOption.get.description.isDefined) { - val desc = stageDataOption.get.description - <div><em>{desc}</em></div><div>{killLink} {nameLink} {details}</div> - } else { - <div>{killLink} {nameLink} {details}</div> + val stageDesc = for { + stageData <- listener.stageIdToData.get(s.stageId) + desc <- stageData.description + } yield { + <div><em>{desc}</em></div> } + + <div>{stageDesc.getOrElse("")} {killLink} {nameLink} {details}</div> } protected def stageRow(s: StageInfo): Seq[Node] = { |