Skip to content

[SPARK-21987][SQL] fix a compatibility issue of sql event logs #19237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cloud-fan wants to merge 2 commits into from
Closed

[SPARK-21987][SQL] fix a compatibility issue of sql event logs #19237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
414457c
fix json protocol
cloud-fan Sep 14, 2017
93cacba
address comments
cloud-fan Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
address comments
  • Loading branch information
@cloud-fan
cloud-fan committed Sep 15, 2017
commit 93cacbabfe72a1c7dba20d00612757ae6e11f854
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/SparkPlanInfo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import org.apache.spark.sql.execution.metric.SQLMetricInfo
* Stores information about a SQL SparkPlan.
*/
@DeveloperApi
@JsonIgnoreProperties(Array("metadata")) // The metadata filed was removed in Spark 2.3.
@JsonIgnoreProperties(Array("metadata")) // The metadata field was removed in Spark 2.3.
class SparkPlanInfo(
val nodeName: String,
val simpleString: String,
Expand Down
37 changes: 18 additions & 19 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/SQLJsonProtocolSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,27 @@ import org.apache.spark.util.JsonProtocol
class SQLJsonProtocolSuite extends SparkFunSuite {

test("SparkPlanGraph backward compatibility: metadata") {
val SQLExecutionStartJsonString =
"""
|{
| "Event":"org.apache.spark.sql.execution.ui.SparkListenerSQLExecutionStart",
| "executionId":0,
| "description":"test desc",
| "details":"test detail",
| "physicalPlanDescription":"test plan",
| "sparkPlanInfo": {
| "nodeName":"TestNode",
| "simpleString":"test string",
| "children":[],
| "metadata":{},
| "metrics":[]
| },
| "time":0
|}
""".stripMargin
val reconstructedEvent = JsonProtocol.sparkEventFromJson(parse(SQLExecutionStartJsonString))
val expectedEvent = SparkListenerSQLExecutionStart(0, "test desc", "test detail", "test plan",
new SparkPlanInfo("TestNode", "test string", Nil, Nil), 0)
assert(reconstructedEvent == expectedEvent)
}

private val SQLExecutionStartJsonString =
"""
|{
| "Event":"org.apache.spark.sql.execution.ui.SparkListenerSQLExecutionStart",
| "executionId":0,
| "description":"test desc",
| "details":"test detail",
| "physicalPlanDescription":"test plan",
| "sparkPlanInfo": {
| "nodeName":"TestNode",
| "simpleString":"test string",
| "children":[],
| "metadata":{},
| "metrics":[]
| },
| "time":0
|}
""".stripMargin
}