Skip to content

Commit 3c9a55e

Browse files
committed
Merge branch 'main' into ff-poolmanager
# Conflicts: # Sources/ConnectionPoolModule/ConnectionLease.swift # Sources/ConnectionPoolModule/ConnectionPool.swift # Sources/ConnectionPoolModule/ConnectionRequest.swift # Sources/ConnectionPoolTestUtils/MockRequest.swift # Sources/PostgresNIO/Pool/PostgresClient.swift # Tests/ConnectionPoolModuleTests/ConnectionPoolTests.swift # Tests/ConnectionPoolModuleTests/ConnectionRequestTests.swift # Tests/ConnectionPoolModuleTests/PoolStateMachine+RequestQueueTests.swift # Tests/ConnectionPoolModuleTests/PoolStateMachineTests.swift
2 parents c79a5b8 + ca70d8c commit 3c9a55e

File tree

5 files changed

+7
-18
lines changed

5 files changed

+7
-18
lines changed
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
//
2-
// ConnectionLease.swift
3-
// postgres-nio
4-
//
5-
// Created by Fabian Fett on 05.05.25.
6-
//
7-
81
public struct ConnectionLease<Connection: PooledConnection>: Sendable {
9-
102
public var connection: Connection
11-
3+
124
@usableFromInline
13-
let _release: @Sendable () -> ()
5+
let _release: @Sendable (Connection) -> ()
146

157
@inlinable
16-
public init(connection: Connection, release: @escaping @Sendable () -> Void) {
8+
public init(connection: Connection, release: @escaping @Sendable (Connection) -> Void) {
179
self.connection = connection
1810
self._release = release
1911
}
2012

2113
@inlinable
2214
public func release() {
23-
self._release()
15+
self._release(self.connection)
2416
}
2517
}

Sources/ConnectionPoolModule/ConnectionPool.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ public final class ConnectionPool<
429429
/*private*/ func runRequestAction(_ action: StateMachine.RequestAction) {
430430
switch action {
431431
case .leaseConnection(let requests, let connection):
432-
let lease = ConnectionLease(connection: connection) {
432+
let lease = ConnectionLease(connection: connection) { connection in
433433
self.releaseConnection(connection)
434434
}
435435
for request in requests {

Sources/ConnectionPoolTestUtils/MockRequest.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import _ConnectionPoolModule
22

33
public final class MockRequest<Connection: PooledConnection>: ConnectionRequestProtocol, Hashable, Sendable {
4-
54
public struct ID: Hashable, Sendable {
65
var objectID: ObjectIdentifier
76

Tests/ConnectionPoolModuleTests/ConnectionRequestTests.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ final class ConnectionRequestTests: XCTestCase {
1212
(continuation: CheckedContinuation<ConnectionLease<MockConnection<NothingConnectionPoolExecutor>>, any Error>) in
1313
let request = ConnectionRequest(id: 42, continuation: continuation)
1414
XCTAssertEqual(request.id, 42)
15-
let lease = ConnectionLease(connection: mockConnection) {
16-
17-
}
15+
let lease = ConnectionLease(connection: mockConnection) { _ in }
1816
continuation.resume(with: .success(lease))
1917
}
2018

Tests/IntegrationTests/PostgresClientTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ final class PostgresClientTests: XCTestCase {
338338
)
339339

340340
var count = 0
341-
for try await (id, label) in rows.decode((Int, String).self) {
341+
for try await _ in rows.decode((Int, String).self) {
342342
count += 1
343343
}
344344
XCTAssertEqual(count, 1)

0 commit comments

Comments
 (0)