stream: fix merge() idle source draining#63567
Open
trivikr wants to merge 1 commit into
Open
Conversation
Defer pulling a merged source again until the consumer requests the next merged item. This prevents fast sources from being drained while the merged iterator is idle. Fixes: nodejs#63566 Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: openai:gpt-5.5
Collaborator
|
Review requested:
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #63567 +/- ##
========================================
Coverage 90.33% 90.34%
========================================
Files 730 730
Lines 234362 234528 +166
Branches 43906 43924 +18
========================================
+ Hits 211713 211879 +166
- Misses 14371 14374 +3
+ Partials 8278 8275 -3
🚀 New features to boost your workflow:
|
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
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.
This updates
stream/itermerge()so fast sources are not pulled tocompletion while the merged consumer is idle.
Previously, after a source produced a batch,
merge()immediately scheduledanother
next()for that same source. If the merged iterator yielded once andthen the consumer paused, fast sources could continue draining in the
background.
The multi-source merge path now waits until the consumer requests the next
merged item before pulling again from the source that produced the previous
item.
Fixes: #63566
Assisted-by: openai:gpt-5.5