Skip to content

Commit 24150c4

Browse files
committed
[SPARK-51750] Upgrade FlatBuffers to v25.2.10
### What changes were proposed in this pull request? This PR aims to upgrade `FlatBuffers` to `v25.2.10` from `v24.3.7`. ### Why are the changes needed? `FlatBuffers` `v24.3.7` was released over one year ago (on Mar 8, 2024), we had better use the latest version in order to support `Swift 6` officially. - https://github.com/google/flatbuffers/releases/tag/v25.2.10 (2025-02-11) - google/flatbuffers#8414 - https://github.com/google/flatbuffers/releases/tag/v25.1.24 (2025-01-25) - https://github.com/google/flatbuffers/releases/tag/v25.1.21 (2025-01-22) - https://github.com/google/flatbuffers/releases/tag/v24.12.23 (2024-12-24) - google/flatbuffers#8330 - https://github.com/google/flatbuffers/releases/tag/v24.3.25 (2024-03-26) ### Does this PR introduce _any_ user-facing change? No. There is no behavior change. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #48 from dongjoon-hyun/SPARK-51750. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent d2afe03 commit 24150c4

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ let package = Package(
3838
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", from: "1.1.0"),
3939
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", from: "1.0.2"),
4040
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),
41-
.package(url: "https://github.com/google/flatbuffers.git", branch: "v24.3.7"),
41+
.package(url: "https://github.com/google/flatbuffers.git", branch: "v25.2.10"),
4242
],
4343
targets: [
4444
.target(

Sources/SparkConnect/File_generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public struct org_apache_arrow_flatbuf_Footer: FlatBufferObject, Verifiable {
120120
let o = _accessor.offset(VTOFFSET.schema.v)
121121
return o == 0
122122
? nil
123-
: org_apache_arrow_flatbuf_Schema(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
123+
: org_apache_arrow_flatbuf_Schema(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
124124
}
125125
public var hasDictionaries: Bool {
126126
let o = _accessor.offset(VTOFFSET.dictionaries.v)

Sources/SparkConnect/Message_generated.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ public struct org_apache_arrow_flatbuf_RecordBatch: FlatBufferObject, Verifiable
326326
return o == 0
327327
? nil
328328
: org_apache_arrow_flatbuf_BodyCompression(
329-
_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
329+
_accessor.bb, o: _accessor.indirect(o + _accessor.position))
330330
}
331331
public static func startRecordBatch(_ fbb: inout FlatBufferBuilder) -> UOffset {
332332
fbb.startTable(with: 4)
@@ -433,7 +433,7 @@ public struct org_apache_arrow_flatbuf_DictionaryBatch: FlatBufferObject, Verifi
433433
return o == 0
434434
? nil
435435
: org_apache_arrow_flatbuf_RecordBatch(
436-
_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
436+
_accessor.bb, o: _accessor.indirect(o + _accessor.position))
437437
}
438438
/// If isDelta is true the values in the dictionary are to be appended to a
439439
/// dictionary with the indicated id. If isDelta is false this dictionary

Sources/SparkConnect/Schema_generated.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,7 @@ public struct org_apache_arrow_flatbuf_DictionaryEncoding: FlatBufferObject, Ver
16551655
let o = _accessor.offset(VTOFFSET.indexType.v)
16561656
return o == 0
16571657
? nil
1658-
: org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
1658+
: org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
16591659
}
16601660
/// By default, dictionaries are not ordered, or the order does not have
16611661
/// semantic meaning. In some statistical, applications, dictionary-encoding
@@ -1785,7 +1785,7 @@ public struct org_apache_arrow_flatbuf_Field: FlatBufferObject, Verifiable {
17851785
return o == 0
17861786
? nil
17871787
: org_apache_arrow_flatbuf_DictionaryEncoding(
1788-
_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
1788+
_accessor.bb, o: _accessor.indirect(o + _accessor.position))
17891789
}
17901790
/// children apply only to nested data types like Struct, List and Union. For
17911791
/// primitive types children will have length 0.

Sources/SparkConnect/SparseTensor_generated.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public struct org_apache_arrow_flatbuf_SparseTensorIndexCOO: FlatBufferObject, V
112112
/// The type of values in indicesBuffer
113113
public var indicesType: org_apache_arrow_flatbuf_Int! {
114114
let o = _accessor.offset(VTOFFSET.indicesType.v)
115-
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
115+
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
116116
}
117117
/// Non-negative byte offsets to advance one value cell along each dimension
118118
/// If omitted, default to row-major order (C-like).
@@ -139,7 +139,7 @@ public struct org_apache_arrow_flatbuf_SparseTensorIndexCOO: FlatBufferObject, V
139139
}
140140
public var mutableIndicesBuffer: org_apache_arrow_flatbuf_Buffer_Mutable! {
141141
let o = _accessor.offset(VTOFFSET.indicesBuffer.v)
142-
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.postion)
142+
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.position)
143143
}
144144
/// This flag is true if and only if the indices matrix is sorted in
145145
/// row-major order, and does not have duplicated entries.
@@ -251,7 +251,7 @@ public struct org_apache_arrow_flatbuf_SparseMatrixIndexCSX: FlatBufferObject, V
251251
/// The type of values in indptrBuffer
252252
public var indptrType: org_apache_arrow_flatbuf_Int! {
253253
let o = _accessor.offset(VTOFFSET.indptrType.v)
254-
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
254+
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
255255
}
256256
/// indptrBuffer stores the location and size of indptr array that
257257
/// represents the range of the rows.
@@ -282,12 +282,12 @@ public struct org_apache_arrow_flatbuf_SparseMatrixIndexCSX: FlatBufferObject, V
282282
}
283283
public var mutableIndptrBuffer: org_apache_arrow_flatbuf_Buffer_Mutable! {
284284
let o = _accessor.offset(VTOFFSET.indptrBuffer.v)
285-
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.postion)
285+
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.position)
286286
}
287287
/// The type of values in indicesBuffer
288288
public var indicesType: org_apache_arrow_flatbuf_Int! {
289289
let o = _accessor.offset(VTOFFSET.indicesType.v)
290-
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
290+
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
291291
}
292292
/// indicesBuffer stores the location and size of the array that
293293
/// contains the column indices of the corresponding non-zero values.
@@ -304,7 +304,7 @@ public struct org_apache_arrow_flatbuf_SparseMatrixIndexCSX: FlatBufferObject, V
304304
}
305305
public var mutableIndicesBuffer: org_apache_arrow_flatbuf_Buffer_Mutable! {
306306
let o = _accessor.offset(VTOFFSET.indicesBuffer.v)
307-
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.postion)
307+
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.position)
308308
}
309309
public static func startSparseMatrixIndexCSX(_ fbb: inout FlatBufferBuilder) -> UOffset {
310310
fbb.startTable(with: 5)
@@ -440,7 +440,7 @@ public struct org_apache_arrow_flatbuf_SparseTensorIndexCSF: FlatBufferObject, V
440440
/// The type of values in indptrBuffers
441441
public var indptrType: org_apache_arrow_flatbuf_Int! {
442442
let o = _accessor.offset(VTOFFSET.indptrType.v)
443-
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
443+
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
444444
}
445445
/// indptrBuffers stores the sparsity structure.
446446
/// Each two consecutive dimensions in a tensor correspond to a buffer in
@@ -481,7 +481,7 @@ public struct org_apache_arrow_flatbuf_SparseTensorIndexCSF: FlatBufferObject, V
481481
/// The type of values in indicesBuffers
482482
public var indicesType: org_apache_arrow_flatbuf_Int! {
483483
let o = _accessor.offset(VTOFFSET.indicesType.v)
484-
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.postion))
484+
return org_apache_arrow_flatbuf_Int(_accessor.bb, o: _accessor.indirect(o + _accessor.position))
485485
}
486486
/// indicesBuffers stores values of nodes.
487487
/// Each tensor dimension corresponds to a buffer in indicesBuffers.
@@ -696,7 +696,7 @@ public struct org_apache_arrow_flatbuf_SparseTensor: FlatBufferObject, Verifiabl
696696
}
697697
public var mutableData: org_apache_arrow_flatbuf_Buffer_Mutable! {
698698
let o = _accessor.offset(VTOFFSET.data.v)
699-
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.postion)
699+
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.position)
700700
}
701701
public static func startSparseTensor(_ fbb: inout FlatBufferBuilder) -> UOffset {
702702
fbb.startTable(with: 7)

Sources/SparkConnect/Tensor_generated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public struct org_apache_arrow_flatbuf_Tensor: FlatBufferObject, Verifiable {
170170
}
171171
public var mutableData: org_apache_arrow_flatbuf_Buffer_Mutable! {
172172
let o = _accessor.offset(VTOFFSET.data.v)
173-
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.postion)
173+
return org_apache_arrow_flatbuf_Buffer_Mutable(_accessor.bb, o: o + _accessor.position)
174174
}
175175
public static func startTensor(_ fbb: inout FlatBufferBuilder) -> UOffset {
176176
fbb.startTable(with: 5)

0 commit comments

Comments
 (0)