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

2.x: make withLatestFrom conditional subscriber, test cold consumption #5495

Merged
merged 2 commits into from
Jul 18, 2017
Merged

2.x: make withLatestFrom conditional subscriber, test cold consumption #5495

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
d66ae49
2.x: make withLatestFrom conditional subscriber, test cold consumption
akarnokd Jul 18, 2017
1563285
Cleanup internal logic, improve coverage
akarnokd Jul 18, 2017
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
18 changes: 14 additions & 4 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFrom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.reactivex.exceptions.Exceptions;
import io.reactivex.functions.BiFunction;
import io.reactivex.internal.functions.ObjectHelper;
import io.reactivex.internal.fuseable.ConditionalSubscriber;
import io.reactivex.internal.subscriptions.SubscriptionHelper;
import io.reactivex.subscribers.SerializedSubscriber;

Expand All @@ -45,7 +46,8 @@ protected void subscribeActual(Subscriber<? super R> s) {
source.subscribe(wlf);
}

static final class WithLatestFromSubscriber<T, U, R> extends AtomicReference<U> implements FlowableSubscriber<T>, Subscription {
static final class WithLatestFromSubscriber<T, U, R> extends AtomicReference<U>
implements ConditionalSubscriber<T>, Subscription {

private static final long serialVersionUID = -312246233408980075L;

Expand All @@ -69,6 +71,13 @@ public void onSubscribe(Subscription s) {

@Override
public void onNext(T t) {
if (!tryOnNext(t)) {
s.get().request(1);
}
}

@Override
public boolean tryOnNext(T t) {
U u = get();
if (u != null) {
R r;
Expand All @@ -78,11 +87,12 @@ public void onNext(T t) {
Exceptions.throwIfFatal(e);
cancel();
actual.onError(e);
return;
return false;
}
actual.onNext(r);
} else{
request(1);
return true;
} else {
return false;
}
}

Expand Down
34 changes: 18 additions & 16 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromMany.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

import io.reactivex.*;
import io.reactivex.annotations.*;
import io.reactivex.disposables.Disposable;
import io.reactivex.exceptions.Exceptions;
import io.reactivex.functions.Function;
import io.reactivex.internal.functions.ObjectHelper;
import io.reactivex.internal.fuseable.ConditionalSubscriber;
import io.reactivex.internal.subscriptions.*;
import io.reactivex.internal.util.*;
import io.reactivex.plugins.RxJavaPlugins;
Expand Down Expand Up @@ -95,7 +95,7 @@ protected void subscribeActual(Subscriber<? super R> s) {

static final class WithLatestFromSubscriber<T, R>
extends AtomicInteger
implements FlowableSubscriber<T>, Subscription {
implements ConditionalSubscriber<T>, Subscription {

private static final long serialVersionUID = 1577321883966341961L;

Expand Down Expand Up @@ -133,7 +133,7 @@ void subscribe(Publisher<?>[] others, int n) {
WithLatestInnerSubscriber[] subscribers = this.subscribers;
AtomicReference<Subscription> s = this.s;
for (int i = 0; i < n; i++) {
if (SubscriptionHelper.isCancelled(s.get()) || done) {
if (SubscriptionHelper.isCancelled(s.get())) {
return;
}
others[i].subscribe(subscribers[i]);
Expand All @@ -147,8 +147,15 @@ public void onSubscribe(Subscription s) {

@Override
public void onNext(T t) {
if (!tryOnNext(t) && !done) {
s.get().request(1);
}
}

@Override
public boolean tryOnNext(T t) {
if (done) {
return;
return false;
}
AtomicReferenceArray<Object> ara = values;
int n = ara.length();
Expand All @@ -159,8 +166,7 @@ public void onNext(T t) {
Object o = ara.get(i);
if (o == null) {
// somebody hasn't signalled yet, skip this T
s.get().request(1);
return;
return false;
}
objects[i + 1] = o;
}
Expand All @@ -173,10 +179,11 @@ public void onNext(T t) {
Exceptions.throwIfFatal(ex);
cancel();
onError(ex);
return;
return false;
}

HalfSerializer.onNext(actual, v, this, error);
return true;
}

@Override
Expand Down Expand Up @@ -207,7 +214,7 @@ public void request(long n) {
@Override
public void cancel() {
SubscriptionHelper.cancel(s);
for (Disposable s : subscribers) {
for (WithLatestInnerSubscriber s : subscribers) {
s.dispose();
}
}
Expand All @@ -226,6 +233,7 @@ void innerError(int index, Throwable t) {
void innerComplete(int index, boolean nonEmpty) {
if (!nonEmpty) {
done = true;
SubscriptionHelper.cancel(s);
cancelAllBut(index);
HalfSerializer.onComplete(actual, this, error);
}
Expand All @@ -243,7 +251,7 @@ void cancelAllBut(int index) {

static final class WithLatestInnerSubscriber
extends AtomicReference<Subscription>
implements FlowableSubscriber<Object>, Disposable {
implements FlowableSubscriber<Object> {

private static final long serialVersionUID = 3256684027868224024L;

Expand Down Expand Up @@ -283,13 +291,7 @@ public void onComplete() {
parent.innerComplete(index, hasValue);
}

@Override
public boolean isDisposed() {
return SubscriptionHelper.isCancelled(get());
}

@Override
public void dispose() {
void dispose() {
SubscriptionHelper.cancel(this);
}
}
Expand Down
114 changes: 113 additions & 1 deletion src/test/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ public void zeroOtherCombinerReturnsNull() {
}

@Test
public void testSingleRequestNotForgottenWhenNoData() {
public void singleRequestNotForgottenWhenNoData() {
PublishProcessor<Integer> source = PublishProcessor.create();
PublishProcessor<Integer> other = PublishProcessor.create();

Expand All @@ -750,4 +750,116 @@ public void testSingleRequestNotForgottenWhenNoData() {

ts.assertValue((2 << 8) + 1);
}

@Test
public void coldSourceConsumedWithoutOther() {
Flowable.range(1, 10).withLatestFrom(Flowable.never(),
new BiFunction<Integer, Object, Object>() {
@Override
public Object apply(Integer a, Object b) throws Exception {
return a;
}
})
.test(1)
.assertResult();
}

@Test
public void coldSourceConsumedWithoutManyOthers() {
Flowable.range(1, 10).withLatestFrom(Flowable.never(), Flowable.never(), Flowable.never(),
new Function4<Integer, Object, Object, Object, Object>() {
@Override
public Object apply(Integer a, Object b, Object c, Object d) throws Exception {
return a;
}
})
.test(1)
.assertResult();
}

@Test
public void otherOnSubscribeRace() {
for (int i = 0; i < 1000; i++) {
final PublishProcessor<Integer> pp0 = PublishProcessor.create();
final PublishProcessor<Integer> pp1 = PublishProcessor.create();
final PublishProcessor<Integer> pp2 = PublishProcessor.create();
final PublishProcessor<Integer> pp3 = PublishProcessor.create();

final Flowable<Object> source = pp0.withLatestFrom(pp1, pp2, pp3, new Function4<Object, Integer, Integer, Integer, Object>() {
@Override
public Object apply(Object a, Integer b, Integer c, Integer d)
throws Exception {
return a;
}
});

final TestSubscriber<Object> ts = new TestSubscriber<Object>();

Runnable r1 = new Runnable() {
@Override
public void run() {
source.subscribe(ts);
}
};

Runnable r2 = new Runnable() {
@Override
public void run() {
ts.cancel();
}
};

TestHelper.race(r1, r2);

ts.assertEmpty();

assertFalse(pp0.hasSubscribers());
assertFalse(pp1.hasSubscribers());
assertFalse(pp2.hasSubscribers());
assertFalse(pp3.hasSubscribers());
}
}

@Test
public void otherCompleteRace() {
for (int i = 0; i < 1000; i++) {
final PublishProcessor<Integer> pp0 = PublishProcessor.create();
final PublishProcessor<Integer> pp1 = PublishProcessor.create();
final PublishProcessor<Integer> pp2 = PublishProcessor.create();
final PublishProcessor<Integer> pp3 = PublishProcessor.create();

final Flowable<Object> source = pp0.withLatestFrom(pp1, pp2, pp3, new Function4<Object, Integer, Integer, Integer, Object>() {
@Override
public Object apply(Object a, Integer b, Integer c, Integer d)
throws Exception {
return a;
}
});

final TestSubscriber<Object> ts = new TestSubscriber<Object>();

Runnable r1 = new Runnable() {
@Override
public void run() {
source.subscribe(ts);
}
};

Runnable r2 = new Runnable() {
@Override
public void run() {
pp1.onComplete();
}
};

TestHelper.race(r1, r2);

ts.assertResult();

assertFalse(pp0.hasSubscribers());
assertFalse(pp1.hasSubscribers());
assertFalse(pp2.hasSubscribers());
assertFalse(pp3.hasSubscribers());
}
}
}