Skip to content

Commit 926a3d4

Browse files
committed
async updates
1 parent df067d4 commit 926a3d4

File tree

2 files changed

+5
-38
lines changed

2 files changed

+5
-38
lines changed

Sources/PostgreSQL/PostgreSQLClient.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ final class PostgreSQLClient {
2222

2323
/// Sends `RedisData` to the server.
2424
func send(_ data: PostgreSQLMessage) -> Future<PostgreSQLMessage> {
25-
return queueStream.queue(data)
25+
return queueStream.enqueue(data)
2626
}
2727
}

Tests/PostgreSQLTests/PostgreSQLClientTests.swift

+4-37
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ class PostgreSQLClientTests: XCTestCase {
2323
let parserStream = PostgreSQLMessageParser().stream(on: eventLoop)
2424
let serializerStream = PostgreSQLMessageSerializer().stream(on: eventLoop)
2525

26-
let startup = PostgreSQLStartupMessage.versionThree(parameters: ["user": "postgres"])
27-
let requests = StaticStream<PostgreSQLMessage>(data: [.startupMessage(startup)])
28-
26+
let requests = PushStream<PostgreSQLMessage>()
2927
requests.stream(to: serializerStream)
3028
.output(to: byteStream)
3129

@@ -44,6 +42,9 @@ class PostgreSQLClientTests: XCTestCase {
4442
print("Closed")
4543
}.upstream!.request(count: .max)
4644

45+
let startup = PostgreSQLStartupMessage.versionThree(parameters: ["user": "postgres"])
46+
requests.push(.startupMessage(startup))
47+
4748
_ = try promise.future.await(on: eventLoop)
4849
}
4950

@@ -52,37 +53,3 @@ class PostgreSQLClientTests: XCTestCase {
5253
("testStreaming", testStreaming),
5354
]
5455
}
55-
56-
public final class StaticStream<O>: Async.OutputStream, ConnectionContext {
57-
public typealias Output = O
58-
59-
public var downstream: AnyInputStream<Output>?
60-
public var data: [Output]
61-
62-
public init(data: [Output]) {
63-
self.data = data.reversed()
64-
}
65-
66-
public func connection(_ event: ConnectionEvent) {
67-
switch event {
68-
case .cancel:
69-
data = []
70-
case .request(var count):
71-
stream: while count > 0 {
72-
count -= 1
73-
if let data = self.data.popLast() {
74-
downstream!.next(data)
75-
} else {
76-
// out of data
77-
break stream
78-
}
79-
}
80-
}
81-
}
82-
83-
public func output<S>(to inputStream: S) where S: Async.InputStream, S.Input == Output {
84-
self.downstream = .init(inputStream)
85-
inputStream.connect(to: self)
86-
}
87-
88-
}

0 commit comments

Comments
 (0)