Skip to content

Commit 4593bae

Browse files
authored
chore: Suppress 'as' test is always true warning (#54)
## What's Changed Remove needless `as ArrowError`s because all errors must be `ArrowError` here. Closes #52.
1 parent b6ca546 commit 4593bae

File tree

1 file changed

+28
-31
lines changed

1 file changed

+28
-31
lines changed

Arrow/Sources/Arrow/ArrowReader.swift

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -247,22 +247,21 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
247247
let message = org_apache_arrow_flatbuf_Message.getRootAsMessage(bb: dataBuffer)
248248
switch message.headerType {
249249
case .recordbatch:
250-
do {
251-
let rbMessage = message.header(type: org_apache_arrow_flatbuf_RecordBatch.self)!
252-
let recordBatch = try loadRecordBatch(
253-
rbMessage,
254-
schema: schemaMessage!,
255-
arrowSchema: result.schema!,
256-
data: input,
257-
messageEndOffset: (Int64(offset) + Int64(length))).get()
250+
let rbMessage = message.header(type: org_apache_arrow_flatbuf_RecordBatch.self)!
251+
let recordBatchResult = loadRecordBatch(
252+
rbMessage,
253+
schema: schemaMessage!,
254+
arrowSchema: result.schema!,
255+
data: input,
256+
messageEndOffset: (Int64(offset) + Int64(length)))
257+
switch recordBatchResult {
258+
case .success(let recordBatch):
258259
result.batches.append(recordBatch)
259-
offset += Int(message.bodyLength + Int64(length))
260-
length = getUInt32(input, offset: offset)
261-
} catch let error as ArrowError {
260+
case .failure(let error):
262261
return .failure(error)
263-
} catch {
264-
return .failure(.unknownError("Unexpected error: \(error)"))
265262
}
263+
offset += Int(message.bodyLength + Int64(length))
264+
length = getUInt32(input, offset: offset)
266265
case .schema:
267266
schemaMessage = message.header(type: org_apache_arrow_flatbuf_Schema.self)!
268267
let schemaResult = loadSchema(schemaMessage!)
@@ -334,19 +333,18 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
334333
let message = org_apache_arrow_flatbuf_Message.getRootAsMessage(bb: mbb)
335334
switch message.headerType {
336335
case .recordbatch:
337-
do {
338-
let rbMessage = message.header(type: org_apache_arrow_flatbuf_RecordBatch.self)!
339-
let recordBatch = try loadRecordBatch(
340-
rbMessage,
341-
schema: footer.schema!,
342-
arrowSchema: result.schema!,
343-
data: fileData,
344-
messageEndOffset: messageEndOffset).get()
336+
let rbMessage = message.header(type: org_apache_arrow_flatbuf_RecordBatch.self)!
337+
let recordBatchResult = loadRecordBatch(
338+
rbMessage,
339+
schema: footer.schema!,
340+
arrowSchema: result.schema!,
341+
data: fileData,
342+
messageEndOffset: messageEndOffset)
343+
switch recordBatchResult {
344+
case .success(let recordBatch):
345345
result.batches.append(recordBatch)
346-
} catch let error as ArrowError {
346+
case .failure(let error):
347347
return .failure(error)
348-
} catch {
349-
return .failure(.unknownError("Unexpected error: \(error)"))
350348
}
351349
default:
352350
return .failure(.unknownError("Unhandled header type: \(message.headerType)"))
@@ -399,16 +397,15 @@ public class ArrowReader { // swiftlint:disable:this type_body_length
399397
}
400398
case .recordbatch:
401399
let rbMessage = message.header(type: org_apache_arrow_flatbuf_RecordBatch.self)!
402-
do {
403-
let recordBatch = try loadRecordBatch(
404-
rbMessage, schema: result.messageSchema!, arrowSchema: result.schema!,
405-
data: dataBody, messageEndOffset: 0).get()
400+
let recordBatchResult = loadRecordBatch(
401+
rbMessage, schema: result.messageSchema!, arrowSchema: result.schema!,
402+
data: dataBody, messageEndOffset: 0)
403+
switch recordBatchResult {
404+
case .success(let recordBatch):
406405
result.batches.append(recordBatch)
407406
return .success(())
408-
} catch let error as ArrowError {
407+
case .failure(let error):
409408
return .failure(error)
410-
} catch {
411-
return .failure(.unknownError("Unexpected error: \(error)"))
412409
}
413410
default:
414411
return .failure(.unknownError("Unhandled header type: \(message.headerType)"))

0 commit comments

Comments
 (0)