Skip to content

Commit 88c549e

Browse files
committed
[SPARK-54045] Upgrade FlatBuffers to v25.9.23
### What changes were proposed in this pull request? This PR aims to upgrade `FlatBuffers` to `v25.9.23` ### Why are the changes needed? To bring the latest bug fixes and improvements like `Windows` support. - https://github.com/google/flatbuffers/releases/tag/v25.9.23 (2025-09-23) - google/flatbuffers#8484 - google/flatbuffers#8577 - google/flatbuffers#8622 - google/flatbuffers#8637 - google/flatbuffers#8643 - google/flatbuffers#8650 - google/flatbuffers#8649 - google/flatbuffers#8702 ### 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 #254 from dongjoon-hyun/SPARK-54045. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 9decdd5 commit 88c549e

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let package = Package(
3737
.package(url: "https://github.com/grpc/grpc-swift-2.git", exact: "2.1.0"),
3838
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "2.1.1"),
3939
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "2.2.0"),
40-
.package(url: "https://github.com/google/flatbuffers.git", branch: "v25.2.10"),
40+
.package(url: "https://github.com/google/flatbuffers.git", branch: "v25.9.23"),
4141
],
4242
targets: [
4343
.target(

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ So far, this library project is tracking the upstream changes of [Apache Arrow](
2121
- [gRPC Swift 2.1 (July 2025)](https://github.com/grpc/grpc-swift-2/releases/tag/2.1.0)
2222
- [gRPC Swift Protobuf 2.1 (August 2025)](https://github.com/grpc/grpc-swift-protobuf/releases/tag/2.1.1)
2323
- [gRPC Swift NIO Transport 2.2 (September 2025)](https://github.com/grpc/grpc-swift-nio-transport/releases/tag/2.2.0)
24-
- [FlatBuffers v25.2.10 (February 2025)](https://github.com/google/flatbuffers/releases/tag/v25.2.10)
24+
- [FlatBuffers v25.9.23 (September 2025)](https://github.com/google/flatbuffers/releases/tag/v25.9.23)
2525
- [Apache Arrow Swift](https://github.com/apache/arrow-swift)
2626

2727
## How to use in your apps

Sources/SparkConnect/ArrowReader.swift

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,7 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
268268

269269
offset += Int(MemoryLayout<UInt32>.size)
270270
streamData = input[offset...]
271-
let dataBuffer = ByteBuffer(
272-
data: streamData,
273-
allowReadingUnalignedBuffers: true)
271+
let dataBuffer = ByteBuffer(data: streamData)
274272
let message = org_apache_arrow_flatbuf_Message.getRootAsMessage(bb: dataBuffer)
275273
switch message.headerType {
276274
case .recordbatch:
@@ -324,9 +322,7 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
324322
let result = ArrowReaderResult()
325323
let footerStartOffset = fileData.count - Int(footerLength + 4)
326324
let footerData = fileData[footerStartOffset...]
327-
let footerBuffer = ByteBuffer(
328-
data: footerData,
329-
allowReadingUnalignedBuffers: useUnalignedBuffers)
325+
let footerBuffer = ByteBuffer(data: footerData)
330326
let footer = org_apache_arrow_flatbuf_Footer.getRootAsFooter(bb: footerBuffer)
331327
let schemaResult = loadSchema(footer.schema!)
332328
switch schemaResult {
@@ -356,9 +352,7 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
356352
recordBatch.offset + (Int64(MemoryLayout<Int32>.size) * messageOffset)
357353
let messageEndOffset = messageStartOffset + Int64(messageLength)
358354
let recordBatchData = fileData[messageStartOffset..<messageEndOffset]
359-
let mbb = ByteBuffer(
360-
data: recordBatchData,
361-
allowReadingUnalignedBuffers: useUnalignedBuffers)
355+
let mbb = ByteBuffer(data: recordBatchData)
362356
let message = org_apache_arrow_flatbuf_Message.getRootAsMessage(bb: mbb)
363357
switch message.headerType {
364358
case .recordbatch:
@@ -410,9 +404,7 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
410404
result: ArrowReaderResult,
411405
useUnalignedBuffers: Bool = false
412406
) -> Result<Void, ArrowError> {
413-
let mbb = ByteBuffer(
414-
data: dataHeader,
415-
allowReadingUnalignedBuffers: useUnalignedBuffers)
407+
let mbb = ByteBuffer(data: dataHeader)
416408
let message = org_apache_arrow_flatbuf_Message.getRootAsMessage(bb: mbb)
417409
switch message.headerType {
418410
case .schema:

Sources/SparkConnect/Message_generated.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// swiftformat:disable all
2121

2222
import FlatBuffers
23+
import Common
2324

2425
/// @nodoc
2526
public enum org_apache_arrow_flatbuf_CompressionType: Int8, Enum, Verifiable {

Sources/SparkConnect/Schema_generated.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// swiftformat:disable all
2121

2222
import FlatBuffers
23+
import Common
2324

2425
/// @nodoc
2526
public enum org_apache_arrow_flatbuf_MetadataVersion: Int16, Enum, Verifiable {

Sources/SparkConnect/SparseTensor_generated.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
// swiftformat:disable all
2121

2222
import FlatBuffers
23+
import Common
2324

2425
/// @nodoc
2526
public enum org_apache_arrow_flatbuf_SparseMatrixCompressedAxis: Int16, Enum, Verifiable {

0 commit comments

Comments
 (0)