Skip to content

Commit 775ac57

Browse files
committed
[SPARK-53774] Update Spark Connect-generated Swift code with protocgen-grpc-swift-2 v2.1.1
### What changes were proposed in this pull request? This PR aims to regenerate `Spark Connect`-generated Swift source code with `protoc-gen-grpc-swift-2` v2.1.1 from apache/spark@c165355. Previously, it was generated by `2.0.0` from apache/spark@c165355 . - #205 (2025-06-30) ### Why are the changes needed? Without changing the Spark protobuf files, this PR only applies code-generation bug fixes including concurrency patches: - https://formulae.brew.sh/formula/protoc-gen-grpc-swift - https://github.com/grpc/grpc-swift-protobuf/releases/tag/2.1.0 - grpc/grpc-swift-protobuf#77 - grpc/grpc-swift-protobuf#85 - https://github.com/grpc/grpc-swift-protobuf/releases/tag/2.1.1 - grpc/grpc-swift-protobuf#86 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #249 from dongjoon-hyun/SPARK-53774. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 6cc0ada commit 775ac57

12 files changed

+347
-1865
lines changed

Sources/SparkConnect/base.grpc.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import GRPCCore
2828
import GRPCProtobuf
29-
import SwiftProtobuf
3029

3130
// MARK: - spark.connect.SparkConnectService
3231

Sources/SparkConnect/base.pb.swift

Lines changed: 82 additions & 419 deletions
Large diffs are not rendered by default.

Sources/SparkConnect/catalog.pb.swift

Lines changed: 24 additions & 114 deletions
Large diffs are not rendered by default.

Sources/SparkConnect/commands.pb.swift

Lines changed: 45 additions & 257 deletions
Large diffs are not rendered by default.

Sources/SparkConnect/common.pb.swift

Lines changed: 15 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,7 @@ fileprivate let _protobuf_package = "spark.connect"
442442

443443
extension Spark_Connect_StorageLevel: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
444444
static let protoMessageName: String = _protobuf_package + ".StorageLevel"
445-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
446-
1: .standard(proto: "use_disk"),
447-
2: .standard(proto: "use_memory"),
448-
3: .standard(proto: "use_off_heap"),
449-
4: .same(proto: "deserialized"),
450-
5: .same(proto: "replication"),
451-
]
445+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}use_disk\0\u{3}use_memory\0\u{3}use_off_heap\0\u{1}deserialized\0\u{1}replication\0")
452446

453447
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
454448
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -498,10 +492,7 @@ extension Spark_Connect_StorageLevel: SwiftProtobuf.Message, SwiftProtobuf._Mess
498492

499493
extension Spark_Connect_ResourceInformation: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
500494
static let protoMessageName: String = _protobuf_package + ".ResourceInformation"
501-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
502-
1: .same(proto: "name"),
503-
2: .same(proto: "addresses"),
504-
]
495+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}name\0\u{1}addresses\0")
505496

506497
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
507498
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -536,12 +527,7 @@ extension Spark_Connect_ResourceInformation: SwiftProtobuf.Message, SwiftProtobu
536527

537528
extension Spark_Connect_ExecutorResourceRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
538529
static let protoMessageName: String = _protobuf_package + ".ExecutorResourceRequest"
539-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
540-
1: .standard(proto: "resource_name"),
541-
2: .same(proto: "amount"),
542-
3: .standard(proto: "discovery_script"),
543-
4: .same(proto: "vendor"),
544-
]
530+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}resource_name\0\u{1}amount\0\u{3}discovery_script\0\u{1}vendor\0")
545531

546532
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
547533
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -590,10 +576,7 @@ extension Spark_Connect_ExecutorResourceRequest: SwiftProtobuf.Message, SwiftPro
590576

591577
extension Spark_Connect_TaskResourceRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
592578
static let protoMessageName: String = _protobuf_package + ".TaskResourceRequest"
593-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
594-
1: .standard(proto: "resource_name"),
595-
2: .same(proto: "amount"),
596-
]
579+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}resource_name\0\u{1}amount\0")
597580

598581
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
599582
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -628,10 +611,7 @@ extension Spark_Connect_TaskResourceRequest: SwiftProtobuf.Message, SwiftProtobu
628611

629612
extension Spark_Connect_ResourceProfile: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
630613
static let protoMessageName: String = _protobuf_package + ".ResourceProfile"
631-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
632-
1: .standard(proto: "executor_resources"),
633-
2: .standard(proto: "task_resources"),
634-
]
614+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}executor_resources\0\u{3}task_resources\0")
635615

636616
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
637617
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -666,10 +646,7 @@ extension Spark_Connect_ResourceProfile: SwiftProtobuf.Message, SwiftProtobuf._M
666646

667647
extension Spark_Connect_Origin: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
668648
static let protoMessageName: String = _protobuf_package + ".Origin"
669-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
670-
1: .standard(proto: "python_origin"),
671-
2: .standard(proto: "jvm_origin"),
672-
]
649+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}python_origin\0\u{3}jvm_origin\0")
673650

674651
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
675652
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -736,10 +713,7 @@ extension Spark_Connect_Origin: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
736713

737714
extension Spark_Connect_PythonOrigin: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
738715
static let protoMessageName: String = _protobuf_package + ".PythonOrigin"
739-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
740-
1: .same(proto: "fragment"),
741-
2: .standard(proto: "call_site"),
742-
]
716+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}fragment\0\u{3}call_site\0")
743717

744718
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
745719
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -774,16 +748,7 @@ extension Spark_Connect_PythonOrigin: SwiftProtobuf.Message, SwiftProtobuf._Mess
774748

775749
extension Spark_Connect_JvmOrigin: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
776750
static let protoMessageName: String = _protobuf_package + ".JvmOrigin"
777-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
778-
1: .same(proto: "line"),
779-
2: .standard(proto: "start_position"),
780-
3: .standard(proto: "start_index"),
781-
4: .standard(proto: "stop_index"),
782-
5: .standard(proto: "sql_text"),
783-
6: .standard(proto: "object_type"),
784-
7: .standard(proto: "object_name"),
785-
8: .standard(proto: "stack_trace"),
786-
]
751+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}line\0\u{3}start_position\0\u{3}start_index\0\u{3}stop_index\0\u{3}sql_text\0\u{3}object_type\0\u{3}object_name\0\u{3}stack_trace\0")
787752

788753
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
789754
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -852,15 +817,7 @@ extension Spark_Connect_JvmOrigin: SwiftProtobuf.Message, SwiftProtobuf._Message
852817

853818
extension Spark_Connect_StackTraceElement: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
854819
static let protoMessageName: String = _protobuf_package + ".StackTraceElement"
855-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
856-
1: .standard(proto: "class_loader_name"),
857-
2: .standard(proto: "module_name"),
858-
3: .standard(proto: "module_version"),
859-
4: .standard(proto: "declaring_class"),
860-
5: .standard(proto: "method_name"),
861-
6: .standard(proto: "file_name"),
862-
7: .standard(proto: "line_number"),
863-
]
820+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}class_loader_name\0\u{3}module_name\0\u{3}module_version\0\u{3}declaring_class\0\u{3}method_name\0\u{3}file_name\0\u{3}line_number\0")
864821

865822
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
866823
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -924,9 +881,7 @@ extension Spark_Connect_StackTraceElement: SwiftProtobuf.Message, SwiftProtobuf.
924881

925882
extension Spark_Connect_Bools: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
926883
static let protoMessageName: String = _protobuf_package + ".Bools"
927-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
928-
1: .same(proto: "values"),
929-
]
884+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}values\0")
930885

931886
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
932887
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -956,9 +911,7 @@ extension Spark_Connect_Bools: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
956911

957912
extension Spark_Connect_Ints: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
958913
static let protoMessageName: String = _protobuf_package + ".Ints"
959-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
960-
1: .same(proto: "values"),
961-
]
914+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}values\0")
962915

963916
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
964917
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -988,9 +941,7 @@ extension Spark_Connect_Ints: SwiftProtobuf.Message, SwiftProtobuf._MessageImple
988941

989942
extension Spark_Connect_Longs: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
990943
static let protoMessageName: String = _protobuf_package + ".Longs"
991-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
992-
1: .same(proto: "values"),
993-
]
944+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}values\0")
994945

995946
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
996947
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -1020,9 +971,7 @@ extension Spark_Connect_Longs: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
1020971

1021972
extension Spark_Connect_Floats: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
1022973
static let protoMessageName: String = _protobuf_package + ".Floats"
1023-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1024-
1: .same(proto: "values"),
1025-
]
974+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}values\0")
1026975

1027976
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
1028977
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -1052,9 +1001,7 @@ extension Spark_Connect_Floats: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
10521001

10531002
extension Spark_Connect_Doubles: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
10541003
static let protoMessageName: String = _protobuf_package + ".Doubles"
1055-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1056-
1: .same(proto: "values"),
1057-
]
1004+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}values\0")
10581005

10591006
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
10601007
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -1084,9 +1031,7 @@ extension Spark_Connect_Doubles: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
10841031

10851032
extension Spark_Connect_Strings: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
10861033
static let protoMessageName: String = _protobuf_package + ".Strings"
1087-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1088-
1: .same(proto: "values"),
1089-
]
1034+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}values\0")
10901035

10911036
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
10921037
while let fieldNumber = try decoder.nextFieldNumber() {

Sources/SparkConnect/example_plugins.pb.swift

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ fileprivate let _protobuf_package = "spark.connect"
100100

101101
extension Spark_Connect_ExamplePluginRelation: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
102102
static let protoMessageName: String = _protobuf_package + ".ExamplePluginRelation"
103-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
104-
1: .same(proto: "input"),
105-
2: .standard(proto: "custom_field"),
106-
]
103+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}input\0\u{3}custom_field\0")
107104

108105
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
109106
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -142,10 +139,7 @@ extension Spark_Connect_ExamplePluginRelation: SwiftProtobuf.Message, SwiftProto
142139

143140
extension Spark_Connect_ExamplePluginExpression: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
144141
static let protoMessageName: String = _protobuf_package + ".ExamplePluginExpression"
145-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
146-
1: .same(proto: "child"),
147-
2: .standard(proto: "custom_field"),
148-
]
142+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{1}child\0\u{3}custom_field\0")
149143

150144
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
151145
while let fieldNumber = try decoder.nextFieldNumber() {
@@ -184,9 +178,7 @@ extension Spark_Connect_ExamplePluginExpression: SwiftProtobuf.Message, SwiftPro
184178

185179
extension Spark_Connect_ExamplePluginCommand: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
186180
static let protoMessageName: String = _protobuf_package + ".ExamplePluginCommand"
187-
static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
188-
1: .standard(proto: "custom_field"),
189-
]
181+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{3}custom_field\0")
190182

191183
mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
192184
while let fieldNumber = try decoder.nextFieldNumber() {

0 commit comments

Comments
 (0)