Repository: spark Updated Branches: refs/heads/branch-1.1 6d1ca2392 -> 55325afbe
[SPARK-5132][Core]Correct stage Attempt Id key in stageInfofromJson SPARK-5132: stageInfoToJson: Stage Attempt Id stageInfoFromJson: Attempt Id Author: hushan[è¡ç] <[email protected]> Closes #3932 from suyanNone/json-stage and squashes the following commits: 41419ab [hushan[è¡ç]] Correct stage Attempt Id key in stageInfofromJson (cherry picked from commit d345ebebd554ac3faa4e870bd7800ed02e89da58) Signed-off-by: Josh Rosen <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/55325afb Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/55325afb Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/55325afb Branch: refs/heads/branch-1.1 Commit: 55325afbedded660f7ce8e335986ab0c0eea26ca Parents: 6d1ca23 Author: hushan[è¡ç] <[email protected]> Authored: Wed Jan 7 12:09:12 2015 -0800 Committer: Josh Rosen <[email protected]> Committed: Wed Jan 7 12:10:07 2015 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/util/JsonProtocol.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/55325afb/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala index 2f7481e..b6fdfaf 100644 --- a/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala +++ b/core/src/main/scala/org/apache/spark/util/JsonProtocol.scala @@ -496,7 +496,7 @@ private[spark] object JsonProtocol { def stageInfoFromJson(json: JValue): StageInfo = { val stageId = (json \ "Stage ID").extract[Int] - val attemptId = (json \ "Attempt ID").extractOpt[Int].getOrElse(0) + val attemptId = (json \ "Stage Attempt ID").extractOpt[Int].getOrElse(0) val stageName = (json \ "Stage Name").extract[String] val numTasks = (json \ "Number of Tasks").extract[Int] val rddInfos = (json \ "RDD Info").extract[List[JValue]].map(rddInfoFromJson(_)) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
