Skip to content

Commit d5a9c37

Browse files
author
Marcelo Vanzin
committed
Update JsonProtocol test, make property name consistent.
1 parent ba34b69 commit d5a9c37

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

core/src/main/scala/org/apache/spark/util/JsonProtocol.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private[spark] object JsonProtocol {
195195
("App ID" -> applicationStart.appId.map(JString(_)).getOrElse(JNothing)) ~
196196
("Timestamp" -> applicationStart.time) ~
197197
("User" -> applicationStart.sparkUser) ~
198-
("appAttemptId" -> applicationStart.appAttemptId.map(JString(_)).getOrElse(JNothing))
198+
("App Attempt ID" -> applicationStart.appAttemptId.map(JString(_)).getOrElse(JNothing))
199199
}
200200

201201
def applicationEndToJson(applicationEnd: SparkListenerApplicationEnd): JValue = {

core/src/test/scala/org/apache/spark/util/JsonProtocolSuite.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,11 @@ class JsonProtocolSuite extends FunSuite {
275275

276276
test("SparkListenerApplicationStart backwards compatibility") {
277277
// SparkListenerApplicationStart in Spark 1.0.0 do not have an "appId" property.
278+
// SparkListenerApplicationStart pre-Spark 1.4 does not have "appAttemptId".
278279
val applicationStart = SparkListenerApplicationStart("test", None, 1L, "user", None)
279280
val oldEvent = JsonProtocol.applicationStartToJson(applicationStart)
280281
.removeField({ _._1 == "App ID" })
282+
.removeField({ _._1 == "App Attempt ID" })
281283
assert(applicationStart === JsonProtocol.applicationStartFromJson(oldEvent))
282284
}
283285

0 commit comments

Comments
 (0)