Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3.x: Fix Observable.flatMap with maxConcurrency hangs #6946

Merged
merged 2 commits into from
Apr 4, 2020
Merged

3.x: Fix Observable.flatMap with maxConcurrency hangs #6946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd634c7
3.x: Fix Observable.flatMap with maxConcurrency hangs
akarnokd Apr 4, 2020
26d1480
Verify Flowable
akarnokd Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ void drainLoop() {
if (checkTerminate()) {
return;
}
int innerCompleted = 0;
SimplePlainQueue<U> svq = queue;

if (svq != null) {
Expand All @@ -333,9 +334,18 @@ void drainLoop() {
}

child.onNext(o);
innerCompleted++;
}
}

if (innerCompleted != 0) {
if (maxConcurrency != Integer.MAX_VALUE) {
subscribeMore(innerCompleted);
innerCompleted = 0;
}
continue;
}

boolean d = done;
svq = queue;
InnerObserver<?, ?>[] inner = observers.get();
Expand All @@ -353,7 +363,6 @@ void drainLoop() {
return;
}

int innerCompleted = 0;
if (n != 0) {
int j = Math.min(n - 1, lastIndex);

Expand Down Expand Up @@ -415,27 +424,33 @@ void drainLoop() {

if (innerCompleted != 0) {
if (maxConcurrency != Integer.MAX_VALUE) {
while (innerCompleted-- != 0) {
ObservableSource<? extends U> p;
synchronized (this) {
p = sources.poll();
if (p == null) {
wip--;
continue;
}
}
subscribeInner(p);
}
subscribeMore(innerCompleted);
innerCompleted = 0;
}
continue;
}

missed = addAndGet(-missed);
if (missed == 0) {
break;
}
}
}

void subscribeMore(int innerCompleted) {
while (innerCompleted-- != 0) {
ObservableSource<? extends U> p;
synchronized (this) {
p = sources.poll();
if (p == null) {
wip--;
continue;
}
}
subscribeInner(p);
}
}

boolean checkTerminate() {
if (disposed) {
return true;
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,4 +1478,28 @@ public void innerCompletesAfterOnNextInDrainThenCancels() {
.requestMore(1)
.assertValuesOnly(1);
}

@Test(timeout = 5000)
public void mixedScalarAsync() {
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
Flowable
.range(0, 20)
.flatMap(
integer -> {
if (integer % 5 != 0) {
return Flowable
.just(integer);
}

return Flowable
.just(-integer)
.observeOn(Schedulers.computation());
},
false,
1
)
.ignoreElements()
.blockingAwait();
}
}
}
24 changes: 24 additions & 0 deletions src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,4 +1240,28 @@ public void fusedInnerCrash2() {

to.assertFailure(TestException.class, 1, 2);
}

@Test(timeout = 5000)
public void mixedScalarAsync() {
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
Observable
.range(0, 20)
.flatMap(
integer -> {
if (integer % 5 != 0) {
return Observable
.just(integer);
}

return Observable
.just(-integer)
.observeOn(Schedulers.computation());
},
false,
1
)
.ignoreElements()
.blockingAwait();
}
}
}