diff --git a/Sources/SparkConnect/ArrowReader.swift b/Sources/SparkConnect/ArrowReader.swift index ca9abb4..8af28ce 100644 --- a/Sources/SparkConnect/ArrowReader.swift +++ b/Sources/SparkConnect/ArrowReader.swift @@ -201,12 +201,15 @@ public class ArrowReader { // swiftlint:disable:this type_body_length ) -> Result { - if isNestedType(field.typeType) { + switch field.typeType { + case .struct_: return loadStructData(loadInfo, field: field) - } else if isFixedPrimitive(field.typeType) { - return loadPrimitiveData(loadInfo, field: field) - } else { - return loadVariableData(loadInfo, field: field) + default: + if isFixedPrimitive(field.typeType) { + return loadPrimitiveData(loadInfo, field: field) + } else { + return loadVariableData(loadInfo, field: field) + } } } diff --git a/Sources/SparkConnect/ArrowReaderHelper.swift b/Sources/SparkConnect/ArrowReaderHelper.swift index 6ccca2f..bb0100a 100644 --- a/Sources/SparkConnect/ArrowReaderHelper.swift +++ b/Sources/SparkConnect/ArrowReaderHelper.swift @@ -262,15 +262,6 @@ func isFixedPrimitive(_ type: org_apache_arrow_flatbuf_Type_) -> Bool { } } -func isNestedType(_ type: org_apache_arrow_flatbuf_Type_) -> Bool { - switch type { - case .struct_: - return true - default: - return false - } -} - func findArrowType( // swiftlint:disable:this cyclomatic_complexity function_body_length _ field: org_apache_arrow_flatbuf_Field ) -> ArrowType {