Skip to content

Commit 17b300b

Browse files
committed
[SPARK-41752][SQL][FOLLOW-UP] Fix Protobuf serializer for SQLExecutionUIData
### What changes were proposed in this pull request? The new field `rootExecutionId` of `SQLExecutionUIData` is not correctly serialized/deserialized in #39268. This PR is to fix it. ### Why are the changes needed? Bug fix ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? UT Closes #39489 from gengliangwang/SPARK-41752. Authored-by: Gengliang Wang <[email protected]> Signed-off-by: Gengliang Wang <[email protected]>
1 parent 32c6cea commit 17b300b

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

core/src/main/protobuf/org/apache/spark/status/protobuf/store_types.proto

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -405,19 +405,19 @@ message SQLPlanMetric {
405405

406406
message SQLExecutionUIData {
407407
int64 execution_id = 1;
408-
string description = 2;
409-
string details = 3;
410-
string physical_plan_description = 4;
411-
map<string, string> modified_configs = 5;
412-
repeated SQLPlanMetric metrics = 6;
413-
int64 submission_time = 7;
414-
optional int64 completion_time = 8;
415-
optional string error_message = 9;
416-
map<int64, JobExecutionStatus> jobs = 10;
417-
repeated int64 stages = 11;
418-
bool metric_values_is_null = 12;
419-
map<int64, string> metric_values = 13;
420-
optional int64 root_execution_id = 14;
408+
int64 root_execution_id = 2;
409+
string description = 3;
410+
string details = 4;
411+
string physical_plan_description = 5;
412+
map<string, string> modified_configs = 6;
413+
repeated SQLPlanMetric metrics = 7;
414+
int64 submission_time = 8;
415+
optional int64 completion_time = 9;
416+
optional string error_message = 10;
417+
map<int64, JobExecutionStatus> jobs = 11;
418+
repeated int64 stages = 12;
419+
bool metric_values_is_null = 13;
420+
map<int64, string> metric_values = 14;
421421
}
422422

423423
message SparkPlanGraphNode {

sql/core/src/main/scala/org/apache/spark/status/protobuf/sql/SQLExecutionUIDataSerializer.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class SQLExecutionUIDataSerializer extends ProtobufSerDe {
3333
val ui = input.asInstanceOf[SQLExecutionUIData]
3434
val builder = StoreTypes.SQLExecutionUIData.newBuilder()
3535
builder.setExecutionId(ui.executionId)
36+
builder.setRootExecutionId(ui.rootExecutionId)
3637
builder.setDescription(ui.description)
3738
builder.setDetails(ui.details)
3839
builder.setPhysicalPlanDescription(ui.physicalPlanDescription)

sql/core/src/test/scala/org/apache/spark/status/protobuf/sql/KVStoreProtobufSerializerSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class KVStoreProtobufSerializerSuite extends SparkFunSuite {
3434
val bytes = serializer.serialize(input)
3535
val result = serializer.deserialize(bytes, classOf[SQLExecutionUIData])
3636
assert(result.executionId == input.executionId)
37+
assert(result.rootExecutionId == input.rootExecutionId)
3738
assert(result.description == input.description)
3839
assert(result.details == input.details)
3940
assert(result.physicalPlanDescription == input.physicalPlanDescription)

0 commit comments

Comments
 (0)