2.x: fix concatMapEager should accept 0 for prefetch #5189
Merged
Conversation
This file contains 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
|
I believe a 0 breaks the internals of the operator and -1 has the completely opposite effect, taking more memory. |
akarnokd
requested changes
Mar 15, 2017
| @@ -6780,7 +6780,6 @@ public final void blockingSubscribe(Subscriber<? super T> subscriber) { | |||
| public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publisher<? extends R>> mapper, | |||
| int maxConcurrency, int prefetch) { | |||
| ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); | |||
| ObjectHelper.verifyPositive(prefetch, "prefetch"); | |||
There was a problem hiding this comment.
No, the validations were right, you shouldn't call with non-positive value.
| @@ -5975,7 +5975,6 @@ public final void blockingSubscribe(Observer<? super T> subscriber) { | |||
| int maxConcurrency, int prefetch) { | |||
| ObjectHelper.requireNonNull(mapper, "mapper is null"); | |||
| ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency"); | |||
| ObjectHelper.verifyPositive(prefetch, "prefetch"); | |||
There was a problem hiding this comment.
No, the validations were right, you shouldn't call with non-positive value.
| @@ -6770,7 +6770,7 @@ public final void blockingSubscribe(Subscriber<? super T> subscriber) { | |||
| * @param mapper the function that maps a sequence of values into a sequence of Publishers that will be | |||
| * eagerly concatenated | |||
| * @param maxConcurrency the maximum number of concurrent subscribed Publishers | |||
| * @param prefetch hints about the number of expected source sequence values | |||
| * @param prefetch hints about the number of expected values from each inner Publisher | |||
There was a problem hiding this comment.
I think this should be reinforced:
hints about the number of expected values from each inner Publisher, must be positive
|
I am sorry with the wrong fix. |
Yes. Please modify only the javadoc. |
nmorioka
force-pushed
the
ConcatMapEagerUseDefault
branch
from
9e5b703
to
00bfea6
Compare
|
Thank you! Also, I think that the test case name is wrong, so I modifed it. |
Codecov Report
@@ Coverage Diff @@
## 2.x #5189 +/- ##
============================================
- Coverage 96.02% 95.97% -0.06%
Complexity 5670 5670
============================================
Files 621 621
Lines 40581 40581
Branches 5620 5620
============================================
- Hits 38969 38946 -23
- Misses 640 661 +21
- Partials 972 974 +2
Continue to review full report at Codecov.
|
akarnokd
approved these changes
Mar 15, 2017
vanniktech
approved these changes
Mar 15, 2017
|
Thanks for the contribution! |
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.
Fixes a bug that Flowable.concatMapEager(mapper , maxConcurrency , prefetch) and Observable.concatMapEager(mapper , maxConcurrency , prefetch) operators will not accept 0 and negative numbers.
Reported in #5185.