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

2.x: fix window() with time+size emission problems #5213

Merged
merged 1 commit into from
Mar 22, 2017
Merged

2.x: fix window() with time+size emission problems #5213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2.x: fix window() with time+size emission problems
  • Loading branch information
@akarnokd
akarnokd committed Mar 22, 2017
commit 158cb0d97bd44133124353de5bf68f3a25207b94
21 changes: 13 additions & 8 deletions src/main/java/io/reactivex/internal/operators/flowable/FlowableWindowTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ static final class WindowExactBoundedSubscriber<T>
final int bufferSize;
final boolean restartTimerOnMaxSize;
final long maxSize;
final Scheduler.Worker worker;

long count;

Expand All @@ -290,8 +291,6 @@ static final class WindowExactBoundedSubscriber<T>

UnicastProcessor<T> window;

Scheduler.Worker worker;

volatile boolean terminated;

final SequentialDisposable timer = new SequentialDisposable();
Expand All @@ -307,6 +306,11 @@ static final class WindowExactBoundedSubscriber<T>
this.bufferSize = bufferSize;
this.maxSize = maxSize;
this.restartTimerOnMaxSize = restartTimerOnMaxSize;
if (restartTimerOnMaxSize) {
worker = scheduler.createWorker();
} else {
worker = null;
}
}

@Override
Expand Down Expand Up @@ -342,10 +346,7 @@ public void onSubscribe(Subscription s) {
Disposable d;
ConsumerIndexHolder consumerIndexHolder = new ConsumerIndexHolder(producerIndex, this);
if (restartTimerOnMaxSize) {
Scheduler.Worker sw = scheduler.createWorker();
worker = sw;
sw.schedulePeriodically(consumerIndexHolder, timespan, timespan, unit);
d = sw;
d = worker.schedulePeriodically(consumerIndexHolder, timespan, timespan, unit);
} else {
d = scheduler.schedulePeriodicallyDirect(consumerIndexHolder, timespan, timespan, unit);
}
Expand Down Expand Up @@ -451,6 +452,10 @@ public void cancel() {

public void dispose() {
DisposableHelper.dispose(timer);
Worker w = worker;
if (w != null) {
w.dispose();
}
}

void drainLoop() {
Expand Down Expand Up @@ -495,9 +500,9 @@ void drainLoop() {

if (isHolder) {
ConsumerIndexHolder consumerIndexHolder = (ConsumerIndexHolder) o;
if (producerIndex == consumerIndexHolder.index) {
if (restartTimerOnMaxSize || producerIndex == consumerIndexHolder.index) {
w.onComplete();

count = 0;
w = UnicastProcessor.<T>create(bufferSize);
window = w;

Expand Down
21 changes: 14 additions & 7 deletions src/main/java/io/reactivex/internal/operators/observable/ObservableWindowTimed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ static final class WindowExactBoundedObserver<T>
final boolean restartTimerOnMaxSize;
final long maxSize;

final Scheduler.Worker worker;

long count;

long producerIndex;
Expand All @@ -262,7 +264,6 @@ static final class WindowExactBoundedObserver<T>

UnicastSubject<T> window;

Scheduler.Worker worker;

volatile boolean terminated;

Expand All @@ -279,6 +280,11 @@ static final class WindowExactBoundedObserver<T>
this.bufferSize = bufferSize;
this.maxSize = maxSize;
this.restartTimerOnMaxSize = restartTimerOnMaxSize;
if (restartTimerOnMaxSize) {
worker = scheduler.createWorker();
} else {
worker = null;
}
}

@Override
Expand All @@ -302,10 +308,7 @@ public void onSubscribe(Disposable s) {
Disposable d;
ConsumerIndexHolder consumerIndexHolder = new ConsumerIndexHolder(producerIndex, this);
if (restartTimerOnMaxSize) {
Scheduler.Worker sw = scheduler.createWorker();
worker = sw;
sw.schedulePeriodically(consumerIndexHolder, timespan, timespan, unit);
d = sw;
d = worker.schedulePeriodically(consumerIndexHolder, timespan, timespan, unit);
} else {
d = scheduler.schedulePeriodicallyDirect(consumerIndexHolder, timespan, timespan, unit);
}
Expand Down Expand Up @@ -394,6 +397,10 @@ public boolean isDisposed() {

void disposeTimer() {
DisposableHelper.dispose(timer);
Worker w = worker;
if (w != null) {
w.dispose();
}
}

void drainLoop() {
Expand Down Expand Up @@ -438,9 +445,9 @@ void drainLoop() {

if (isHolder) {
ConsumerIndexHolder consumerIndexHolder = (ConsumerIndexHolder) o;
if (producerIndex == consumerIndexHolder.index) {
if (restartTimerOnMaxSize || producerIndex == consumerIndexHolder.index) {
w.onComplete();

count = 0;
w = UnicastSubject.create(bufferSize);
window = w;

Expand Down
103 changes: 103 additions & 0 deletions src/test/java/io/reactivex/internal/operators/flowable/FlowableWindowWithTimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,4 +704,107 @@ public void sizeTimeTimeout() {

ts.values().get(0).test().assertResult();
}

@Test
public void periodicWindowCompletion() {
TestScheduler scheduler = new TestScheduler();
FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();

TestSubscriber<Flowable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, Long.MAX_VALUE, false)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionRestartTimer() {
TestScheduler scheduler = new TestScheduler();
FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();

TestSubscriber<Flowable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, Long.MAX_VALUE, true)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionBounded() {
TestScheduler scheduler = new TestScheduler();
FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();

TestSubscriber<Flowable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 5, false)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionRestartTimerBounded() {
TestScheduler scheduler = new TestScheduler();
FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();

TestSubscriber<Flowable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 5, true)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionRestartTimerBoundedSomeData() {
TestScheduler scheduler = new TestScheduler();
FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();

TestSubscriber<Flowable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 2, true)
.test();

ps.onNext(1);
ps.onNext(2);

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(22)
.assertNoErrors()
.assertNotComplete();
}
@Test
public void countRestartsOnTimeTick() {
TestScheduler scheduler = new TestScheduler();
FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();

TestSubscriber<Flowable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 5, true)
.test();

// window #1
ps.onNext(1);
ps.onNext(2);

scheduler.advanceTimeBy(5, TimeUnit.MILLISECONDS);

// window #2
ps.onNext(3);
ps.onNext(4);
ps.onNext(5);
ps.onNext(6);

ts.assertValueCount(2)
.assertNoErrors()
.assertNotComplete();
}
}

103 changes: 103 additions & 0 deletions src/test/java/io/reactivex/internal/operators/observable/ObservableWindowWithTimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,4 +603,107 @@ public void sizeTimeTimeout() {

ts.values().get(0).test().assertResult();
}

@Test
public void periodicWindowCompletion() {
TestScheduler scheduler = new TestScheduler();
Subject<Integer> ps = PublishSubject.<Integer>create();

TestObserver<Observable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, Long.MAX_VALUE, false)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionRestartTimer() {
TestScheduler scheduler = new TestScheduler();
Subject<Integer> ps = PublishSubject.<Integer>create();

TestObserver<Observable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, Long.MAX_VALUE, true)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionBounded() {
TestScheduler scheduler = new TestScheduler();
Subject<Integer> ps = PublishSubject.<Integer>create();

TestObserver<Observable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 5, false)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionRestartTimerBounded() {
TestScheduler scheduler = new TestScheduler();
Subject<Integer> ps = PublishSubject.<Integer>create();

TestObserver<Observable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 5, true)
.test();

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(21)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void periodicWindowCompletionRestartTimerBoundedSomeData() {
TestScheduler scheduler = new TestScheduler();
Subject<Integer> ps = PublishSubject.<Integer>create();

TestObserver<Observable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 2, true)
.test();

ps.onNext(1);
ps.onNext(2);

scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);

ts.assertValueCount(22)
.assertNoErrors()
.assertNotComplete();
}

@Test
public void countRestartsOnTimeTick() {
TestScheduler scheduler = new TestScheduler();
Subject<Integer> ps = PublishSubject.<Integer>create();

TestObserver<Observable<Integer>> ts = ps.window(5, TimeUnit.MILLISECONDS, scheduler, 5, true)
.test();

// window #1
ps.onNext(1);
ps.onNext(2);

scheduler.advanceTimeBy(5, TimeUnit.MILLISECONDS);

// window #2
ps.onNext(3);
ps.onNext(4);
ps.onNext(5);
ps.onNext(6);

ts.assertValueCount(2)
.assertNoErrors()
.assertNotComplete();
}
}