Skip to content

Commit 8bdf7b6

Browse files
authored
Rename _ConnectionPoolModule as _ValkeyConnectionPool (#115)
1 parent 2fe8ede commit 8bdf7b6

18 files changed

+9
-10
lines changed

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let package = Package(
3636
.target(
3737
name: "Valkey",
3838
dependencies: [
39-
.byName(name: "_ConnectionPoolModule"),
39+
.byName(name: "_ValkeyConnectionPool"),
4040
.product(name: "DequeModule", package: "swift-collections"),
4141
.product(name: "Logging", package: "swift-log"),
4242
.product(name: "NIOCore", package: "swift-nio"),
@@ -58,12 +58,12 @@ let package = Package(
5858
swiftSettings: defaultSwiftSettings
5959
),
6060
.target(
61-
name: "_ConnectionPoolModule",
61+
name: "_ValkeyConnectionPool",
6262
dependencies: [
6363
.product(name: "Atomics", package: "swift-atomics"),
6464
.product(name: "DequeModule", package: "swift-collections"),
6565
],
66-
path: "Sources/ConnectionPoolModule",
66+
path: "Sources/ValkeyConnectionPool",
6767
swiftSettings: defaultSwiftSettings
6868
),
6969
.executableTarget(

Sources/Valkey/Connection/ValkeyConnection+ConnectionPool.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import Logging
1616
import Synchronization
17-
import _ConnectionPoolModule
17+
import _ValkeyConnectionPool
1818

1919
/// Extend ValkeyConnection so we can use it with the connection pool
2020
@available(valkeySwift 1.0, *)

Sources/Valkey/ValkeyClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import NIOPosix
1818
import NIOSSL
1919
import NIOTransportServices
2020
import Synchronization
21-
import _ConnectionPoolModule
21+
import _ValkeyConnectionPool
2222

2323
#if ServiceLifecycleSupport
2424
import ServiceLifecycle

Sources/Valkey/ValkeyClientConfiguration.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import NIOSSL
16-
import _ConnectionPoolModule
16+
import _ValkeyConnectionPool
1717

1818
/// Configuration for the Valkey client
1919
@available(valkeySwift 1.0, *)

Sources/ConnectionPoolModule/ConnectionPool.swift renamed to Sources/ValkeyConnectionPool/ConnectionPool.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ where
181181

182182
@usableFromInline let stateBox: NIOLockedValueBox<State>
183183

184-
private let requestIDGenerator = _ConnectionPoolModule.ConnectionIDGenerator()
184+
private let requestIDGenerator = _ValkeyConnectionPool.ConnectionIDGenerator()
185185

186186
@usableFromInline
187187
let eventStream: AsyncStream<NewPoolActions>

Sources/ConnectionPoolModule/ConnectionRequest.swift renamed to Sources/ValkeyConnectionPool/ConnectionRequest.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
public struct ConnectionRequest<Connection: PooledConnection>: ConnectionRequestProtocol {
32
public typealias ID = Int
43

@@ -22,13 +21,13 @@ public struct ConnectionRequest<Connection: PooledConnection>: ConnectionRequest
2221
}
2322

2423
@usableFromInline
25-
let requestIDGenerator = _ConnectionPoolModule.ConnectionIDGenerator()
24+
let requestIDGenerator = _ValkeyConnectionPool.ConnectionIDGenerator()
2625

2726
@available(macOS 13.0, iOS 16.0, tvOS 16.0, watchOS 9.0, *)
2827
extension ConnectionPool where Request == ConnectionRequest<Connection> {
2928
public convenience init(
3029
configuration: ConnectionPoolConfiguration,
31-
idGenerator: ConnectionIDGenerator = _ConnectionPoolModule.ConnectionIDGenerator(),
30+
idGenerator: ConnectionIDGenerator = _ValkeyConnectionPool.ConnectionIDGenerator(),
3231
keepAliveBehavior: KeepAliveBehavior,
3332
observabilityDelegate: ObservabilityDelegate,
3433
clock: Clock = ContinuousClock(),

0 commit comments

Comments
 (0)