FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge can now operate in horizontally unbounded mode. by akarnokd · Pull Request #3169 · ReactiveX/RxJava · GitHub

/ RxJava Public

Merge can now operate in horizontally unbounded mode. - #3169

Merged
akarnokd merged 1 commit into
ReactiveX:1.xfrom
akarnokd:MergeHorizontalUnbounded
Nov 10, 2015
ConversationCommits (1)ChecksFiles changed
Merged

Merge can now operate in horizontally unbounded mode.#3169
akarnokd merged 1 commit into
ReactiveX:1.xfrom
akarnokd:MergeHorizontalUnbounded

Conversation

akarnokd commented Aug 20, 2015

Copy link
Copy Markdown
Member

Resolves #3156

Note that since the default merge operation is unbounded, this change could lead to an excessive memory usage when flatMapping fast sources. Note that the pre 1.0.13 version did this albeit on a slighty slower path.

The change also affects the scalar optimization as well. Pre 1.0.13 implicitly limited the concurrency level to RxRingBuffer.SIZE when scalars were received. This version now fills the queue up to the concurrency level.

For 2.0, I suggest having a bounded behavior by default and require the developer to specify Integer.MAX_VALUE to go for the unbounded behavior so he/she knows about the consequences.

benjchristensen modified the milestone: 1.0.x Aug 28, 2015
akarnokd closed this Sep 9, 2015
akarnokd deleted the MergeHorizontalUnbounded branch September 9, 2015 15:32
akarnokd restored the MergeHorizontalUnbounded branch September 9, 2015 15:32
akarnokd reopened this Sep 9, 2015

benjchristensen commented Sep 9, 2015

Copy link
Copy Markdown
Member

I'll have to allocate some time to review this later as it is somewhat detailed. Thank you for tackling this.

benjchristensen commented Sep 9, 2015

Copy link
Copy Markdown
Member

Pre 1.0.13 implicitly limited the concurrency level to RxRingBuffer.SIZE when scalars were received.

That was done by design, since scalars behave as onNext. And we can limit the number of Observables being merged if we have scalars queued up for delivery.

The reason we can't limit the number of async Observables is because we don't know if they will emit or not and thus risk deadlock.

abersnaze mentioned this pull request Oct 8, 2015
Closed
6 tasks
akarnokd mentioned this pull request Oct 9, 2015
Closed
akarnokd mentioned this pull request Oct 20, 2015
Merged
akarnokd mentioned this pull request Oct 28, 2015
Merged
akarnokd added a commit to akarnokd/RxJava that referenced this pull request Nov 9, 2015
1.x: eager concatMap to choose safe or unsafe queue based on platform.
c89ea32 
I forgot to add the choice because 2.x SpscArrayQueue doesn't use
Unsafe. I copied the SpscAtomicArrayQueue from ReactiveX#3169 and I hope it won't
conflict.
akarnokd mentioned this pull request Nov 9, 2015
Merged

stealthcode commented Nov 10, 2015

Copy link
Copy Markdown

👍

akarnokd commented Nov 10, 2015

Copy link
Copy Markdown
Member Author

I'll rebase this.

akarnokd force-pushed the MergeHorizontalUnbounded branch from fb80b82 to e8beca7 Compare November 10, 2015 21:30

akarnokd commented Nov 10, 2015

Copy link
Copy Markdown
Member Author

Rebased, let's get this finally in.

akarnokd added a commit that referenced this pull request Nov 10, 2015
Merge pull request #3169 from akarnokd/MergeHorizontalUnbounded
9bc1987 
Merge can now operate in horizontally unbounded mode.
akarnokd merged commit 9bc1987 into ReactiveX:1.x Nov 10, 2015
akarnokd deleted the MergeHorizontalUnbounded branch November 10, 2015 21:39

stealthcode commented Nov 10, 2015

Copy link
Copy Markdown

Thanks

tejasgarde pushed a commit to tejasgarde/RxJava that referenced this pull request Apr 4, 2016
1.x: eager concatMap to choose safe or unsafe queue based on platform.
cf7fe9f 
I forgot to add the choice because 2.x SpscArrayQueue doesn't use
Unsafe. I copied the SpscAtomicArrayQueue from ReactiveX#3169 and I hope it won't
conflict.
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Bug Enhancement

Projects

None yet

Milestone

1.0.x

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL