Move row data decoding out of state machine (#52)

lovetodream · Jul 6, 2024 · c4da4c1 · c4da4c1
1 parent 84068c7
commit c4da4c1
Show file tree

Hide file tree

Showing 17 changed files with 701 additions and 839 deletions.
diff --git a/Sources/OracleNIO/ConnectionStateMachine/ConnectionStateMachine.swift b/Sources/OracleNIO/ConnectionStateMachine/ConnectionStateMachine.swift
@@ -134,7 +134,6 @@ struct ConnectionStateMachine {
             EventLoopPromise<OracleRowStream>,
             StatementResult
         )
-        case needMoreData
 
         // Statement streaming
         case forwardRows([DataRow])
@@ -753,29 +752,6 @@ struct ConnectionStateMachine {
         }
     }
 
-    mutating func chunkReceived(
-        _ buffer: ByteBuffer, capabilities: Capabilities
-    ) -> ConnectionAction {
-        switch self.state {
-        case .statement(var statement):
-            return self.avoidingStateMachineCoW { machine in
-                let action = statement.chunkReceived(
-                    buffer, capabilities: capabilities
-                )
-                machine.state = .statement(statement)
-                return machine.modify(with: action)
-            }
-
-        case .loggingOff, .closing:
-            // Might happen if an error is thrown in row decoding and the
-            // connection is closed immediately after.
-            return .wait
-
-        default:
-            preconditionFailure("Invalid state: \(self.state)")
-        }
-    }
-
     mutating func ioVectorReceived(
         _ vector: OracleBackendMessage.InOutVector
     ) -> ConnectionAction {
@@ -921,7 +897,6 @@ struct ConnectionStateMachine {
                 .sendFetch,
                 .sendFlushOutBinds,
                 .succeedStatement,
-                .needMoreData,
                 .forwardRows,
                 .forwardStreamComplete,
                 .forwardCancelComplete,
@@ -1172,8 +1147,6 @@ extension ConnectionStateMachine {
             return .failStatement(promise, with: error, cleanupContext: nil)
         case .succeedStatement(let promise, let columns):
             return .succeedStatement(promise, columns)
-        case .needMoreData:
-            return .needMoreData
         case .forwardRows(let rows):
             return .forwardRows(rows)
         case .forwardStreamComplete(let rows, let cursorID):