ConnectionPool should support draining connections#638
Merged
fabianfett merged 4 commits intovapor:mainfrom Mar 30, 2026
Merged
ConnectionPool should support draining connections#638fabianfett merged 4 commits intovapor:mainfrom
fabianfett merged 4 commits intovapor:mainfrom
Conversation
Fix weird states Test crash fix.
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #638 +/- ##
==========================================
+ Coverage 76.39% 76.56% +0.17%
==========================================
Files 135 135
Lines 10239 10383 +144
==========================================
+ Hits 7822 7950 +128
- Misses 2417 2433 +16
🚀 New features to boost your workflow:
|
gwynne
approved these changes
Mar 30, 2026
Member
gwynne
left a comment
gwynne
left a comment
There was a problem hiding this comment.
Couple of minor remarks, nothing blocking.
|
|
||
| @inlinable | ||
| mutating func connectionWillClose(_ connectionID: Connection.ID) -> ConnectionWillCloseAction { | ||
| guard let index = self.connections.firstIndex(where: { $0.id == connectionID }) else { |
Member
There was a problem hiding this comment.
General question: Why is self.connections an Array rather than a Dictionary or OrderedDictionary? I would assume it has something to do with speed on hotter paths than this particular line of code; I just cringe when I see "oh look, O(n) iteration of an ordered collection looking for an easily-hashed identifier".
Collaborator
Author
There was a problem hiding this comment.
yeah, actually O(n) is smaller than calculating O(1) hashes :)
Comment on lines
+471
to
+476
| let newUsedStreams = usedStreams - returnedStreams | ||
| if newUsedStreams == 0 { | ||
| self.state = .closing(connection) | ||
| return .drainingComplete(connection) | ||
| } else { | ||
| self.state = .draining(connection, usedStreams: newUsedStreams) |
Member
There was a problem hiding this comment.
Suggested change
| let newUsedStreams = usedStreams - returnedStreams | |
| if newUsedStreams == 0 { | |
| self.state = .closing(connection) | |
| return .drainingComplete(connection) | |
| } else { | |
| self.state = .draining(connection, usedStreams: newUsedStreams) | |
| if usedStreams == returnedStreams { | |
| self.state = .closing(connection) | |
| return .drainingComplete(connection) | |
| } else { | |
| self.state = .draining(connection, usedStreams: usedStreams - returnedStreams) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.