apacheGH-46296: [Swift] Add struct ipc unit test, enum fix and changes from PR 46297

Author: abandy

swift/Arrow/Sources/Arrow/ArrowType.swift

@@ -385,6 +385,8 @@ extension ArrowType.Info: Equatable {
             return lhsId == rhsId
         case (.timeInfo(let lhsId), .timeInfo(let rhsId)):
             return lhsId == rhsId
+        case (.complexInfo(let lhsId), .complexInfo(let rhsId)):
+            return lhsId == rhsId
         default:
             return false
         }

swift/Arrow/Sources/Arrow/ProtoUtil.swift

@@ -64,6 +64,8 @@ func fromProto( // swiftlint:disable:this cyclomatic_complexity
             let arrowUnit: ArrowTime64Unit = timeType.unit == .microsecond ? .microseconds : .nanoseconds
             arrowType = ArrowTypeTime64(arrowUnit)
         }
+    case .struct_:
+        arrowType = ArrowType(ArrowType.ArrowStruct)
     default:
         arrowType = ArrowType(ArrowType.ArrowUnknown)
     }

swift/Arrow/Tests/ArrowTests/IPCTests.swift

@@ -118,7 +118,44 @@ func makeRecordBatch() throws -> RecordBatch {
     }
 }
 
-final class IPCFileReaderTests: XCTestCase {
+final class IPCFileReaderTests: XCTestCase { // swiftlint:disable:this type_body_length
+    func testFileReader_struct() throws {
+        let fileURL = currentDirectory().appendingPathComponent("../../testdata_struct.arrow")
+        let arrowReader = ArrowReader()
+        let result = arrowReader.fromFile(fileURL)
+        let recordBatches: [RecordBatch]
+        switch result {
+        case .success(let result):
+            recordBatches = result.batches
+        case .failure(let error):
+            throw error
+        }
+
+        XCTAssertEqual(recordBatches.count, 1)
+        for recordBatch in recordBatches {
+            XCTAssertEqual(recordBatch.length, 3)
+            XCTAssertEqual(recordBatch.columns.count, 1)
+            XCTAssertEqual(recordBatch.schema.fields.count, 1)
+            XCTAssertEqual(recordBatch.schema.fields[0].type.info, ArrowType.ArrowStruct)
+            let column = recordBatch.columns[0]
+            XCTAssertNotNil(column.array as? StructArray)
+            if let structArray = column.array as? StructArray {
+                XCTAssertEqual(structArray.arrowFields?.count, 2)
+                XCTAssertEqual(structArray.arrowFields?[0].type.info, ArrowType.ArrowString)
+                XCTAssertEqual(structArray.arrowFields?[1].type.info, ArrowType.ArrowBool)
+                for index in 0..<structArray.length {
+                    if index == 2 {
+                        XCTAssertNil(structArray[index])
+                    } else {
+                        XCTAssertEqual(structArray[index]?[0] as? String, "\(index)")
+                        XCTAssertEqual(structArray[index]?[1] as? Bool, index % 2 == 1)
+                    }
+                }
+            }
+
+        }
+    }
+
     func testFileReader_double() throws {
         let fileURL = currentDirectory().appendingPathComponent("../../testdata_double.arrow")
         let arrowReader = ArrowReader()
@@ -384,3 +421,4 @@ final class IPCFileReaderTests: XCTestCase {
         }
     }
 }
+// swiftlint:disable:this file_length

swift/data-generator/swift-datagen/go.mod

@@ -16,7 +16,8 @@
 
 module swift-datagen/main
 
-go 1.22.7
+go 1.23.0
+
 toolchain go1.24.1
 
 require github.com/apache/arrow-go/v18 v18.2.0

swift/data-generator/swift-datagen/main.go

@@ -82,7 +82,35 @@ func writeDoubleData() {
 	writeBytes(rec, "testdata_double.arrow")
 }
 
+func writeStructData() {
+	mem := memory.NewGoAllocator()
+
+	fields := []arrow.Field{
+		{Name: "my struct", Type: arrow.StructOf([]arrow.Field{
+			{Name: "my string", Type: arrow.BinaryTypes.String},
+			{Name: "my bool", Type: arrow.FixedWidthTypes.Boolean},
+		}...)},
+	}
+
+	schema := arrow.NewSchema(fields, nil)
+
+	bld := array.NewRecordBuilder(mem, schema)
+	defer bld.Release()
+
+	sb := bld.Field(0).(*array.StructBuilder)
+	f1b := sb.FieldBuilder(0).(*array.StringBuilder)
+	f2b := sb.FieldBuilder(1).(*array.BooleanBuilder)
+
+	sb.AppendValues([]bool{true, true, false})
+	f1b.AppendValues([]string{"0", "1", ""}, []bool{true, true, false})
+	f2b.AppendValues([]bool{false, true, false}, []bool{true, true, false})
+
+	rec := bld.NewRecord()
+	writeBytes(rec, "testdata_struct.arrow")
+}
+
 func main() {
 	writeBoolData()
 	writeDoubleData()
+	writeStructData()
 }