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

Fix for buffer not stopping when unsubscribed. #596

Merged
merged 1 commit into from
Dec 10, 2013
Merged

Fix for buffer not stopping when unsubscribed. #596

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
18 changes: 16 additions & 2 deletions rxjava-core/src/main/java/rx/operators/ChunkedOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public OverlappingChunks(Observer<? super C> observer, Func0<? extends Chunk<T,
* The type of object all internal {@link rx.operators.ChunkedOperation.Chunk} objects record.
* <C> The type of object being tracked by the {@link Chunk}
*/
protected static class TimeAndSizeBasedChunks<T, C> extends Chunks<T, C> {
protected static class TimeAndSizeBasedChunks<T, C> extends Chunks<T, C> implements Subscription {

private final ConcurrentMap<Chunk<T, C>, Subscription> subscriptions = new ConcurrentHashMap<Chunk<T, C>, Subscription>();

Expand Down Expand Up @@ -207,6 +207,12 @@ public void pushValue(T value) {
}
}
}
@Override
public void unsubscribe() {
for (Subscription s : subscriptions.values()) {
s.unsubscribe();
}
}
}

/**
Expand All @@ -218,7 +224,7 @@ public void pushValue(T value) {
* The type of object all internal {@link rx.operators.ChunkedOperation.Chunk} objects record.
* <C> The type of object being tracked by the {@link Chunk}
*/
protected static class TimeBasedChunks<T, C> extends OverlappingChunks<T, C> {
protected static class TimeBasedChunks<T, C> extends OverlappingChunks<T, C> implements Subscription {

private final ConcurrentMap<Chunk<T, C>, Subscription> subscriptions = new ConcurrentHashMap<Chunk<T, C>, Subscription>();

Expand Down Expand Up @@ -250,6 +256,14 @@ public void emitChunk(Chunk<T, C> chunk) {
subscriptions.remove(chunk);
super.emitChunk(chunk);
}

@Override
public void unsubscribe() {
for (Subscription s : subscriptions.values()) {
s.unsubscribe();
}
}

}

/**
Expand Down
60 changes: 51 additions & 9 deletions rxjava-core/src/main/java/rx/operators/OperationBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@

import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

import rx.Observable;
import rx.Observable.OnSubscribeFunc;
import rx.Observer;
import rx.Scheduler;
import rx.Subscription;
import rx.concurrency.Schedulers;
import rx.subscriptions.CompositeSubscription;
import rx.util.functions.Func0;
import rx.util.functions.Func1;

Expand Down Expand Up @@ -65,11 +67,14 @@ public static <T, TClosing> OnSubscribeFunc<List<T>> buffer(final Observable<T>
public Subscription onSubscribe(Observer<? super List<T>> observer) {
NonOverlappingChunks<T, List<T>> buffers = new NonOverlappingChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker());
ChunkCreator creator = new ObservableBasedSingleChunkCreator<T, List<T>, TClosing>(buffers, bufferClosingSelector);
return source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator));
return new CompositeSubscription(
new ChunkToSubscription(creator),
source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator))
);
}
};
}

/**
* <p>This method creates a {@link Func1} object which represents the buffer operation. This operation takes
* values from the specified {@link Observable} source and stores them in the currently active chunks. Initially
Expand Down Expand Up @@ -101,7 +106,10 @@ public static <T, TOpening, TClosing> OnSubscribeFunc<List<T>> buffer(final Obse
public Subscription onSubscribe(final Observer<? super List<T>> observer) {
OverlappingChunks<T, List<T>> buffers = new OverlappingChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker());
ChunkCreator creator = new ObservableBasedMultiChunkCreator<T, List<T>, TOpening, TClosing>(buffers, bufferOpenings, bufferClosingSelector);
return source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator));
return new CompositeSubscription(
new ChunkToSubscription(creator),
source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator))
);
}
};
}
Expand Down Expand Up @@ -156,7 +164,10 @@ public static <T> OnSubscribeFunc<List<T>> buffer(final Observable<T> source, fi
public Subscription onSubscribe(final Observer<? super List<T>> observer) {
Chunks<T, List<T>> chunks = new SizeBasedChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker(), count);
ChunkCreator creator = new SkippingChunkCreator<T, List<T>>(chunks, skip);
return source.subscribe(new ChunkObserver<T, List<T>>(chunks, observer, creator));
return new CompositeSubscription(
new ChunkToSubscription(creator),
source.subscribe(new ChunkObserver<T, List<T>>(chunks, observer, creator))
);
}
};
}
Expand Down Expand Up @@ -211,7 +222,10 @@ public static <T> OnSubscribeFunc<List<T>> buffer(final Observable<T> source, fi
public Subscription onSubscribe(final Observer<? super List<T>> observer) {
NonOverlappingChunks<T, List<T>> buffers = new NonOverlappingChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker());
ChunkCreator creator = new TimeBasedChunkCreator<T, List<T>>(buffers, timespan, unit, scheduler);
return source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator));
return new CompositeSubscription(
new ChunkToSubscription(creator),
source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator))
);
}
};
}
Expand Down Expand Up @@ -270,9 +284,13 @@ public static <T> OnSubscribeFunc<List<T>> buffer(final Observable<T> source, fi
return new OnSubscribeFunc<List<T>>() {
@Override
public Subscription onSubscribe(final Observer<? super List<T>> observer) {
Chunks<T, List<T>> chunks = new TimeAndSizeBasedChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker(), count, timespan, unit, scheduler);
TimeAndSizeBasedChunks<T, List<T>> chunks = new TimeAndSizeBasedChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker(), count, timespan, unit, scheduler);
ChunkCreator creator = new SingleChunkCreator<T, List<T>>(chunks);
return source.subscribe(new ChunkObserver<T, List<T>>(chunks, observer, creator));
return new CompositeSubscription(
chunks,
new ChunkToSubscription(creator),
source.subscribe(new ChunkObserver<T, List<T>>(chunks, observer, creator))
);
}
};
}
Expand Down Expand Up @@ -331,9 +349,13 @@ public static <T> OnSubscribeFunc<List<T>> buffer(final Observable<T> source, fi
return new OnSubscribeFunc<List<T>>() {
@Override
public Subscription onSubscribe(final Observer<? super List<T>> observer) {
OverlappingChunks<T, List<T>> buffers = new TimeBasedChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker(), timespan, unit, scheduler);
TimeBasedChunks<T, List<T>> buffers = new TimeBasedChunks<T, List<T>>(observer, OperationBuffer.<T> bufferMaker(), timespan, unit, scheduler);
ChunkCreator creator = new TimeBasedChunkCreator<T, List<T>>(buffers, timeshift, unit, scheduler);
return source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator));
return new CompositeSubscription(
buffers,
new ChunkToSubscription(creator),
source.subscribe(new ChunkObserver<T, List<T>>(buffers, observer, creator))
);
}
};
}
Expand All @@ -355,4 +377,24 @@ public List<T> getContents() {
return contents;
}
}

/**
* Converts a chunk creator into a subscription which stops the chunk.
*/
private static class ChunkToSubscription implements Subscription {
private ChunkCreator cc;
private final AtomicBoolean done;
public ChunkToSubscription(ChunkCreator cc) {
this.cc = cc;
this.done = new AtomicBoolean();
}
@Override
public void unsubscribe() {
if (done.compareAndSet(false, true)) {
ChunkCreator cc0 = cc;
cc = null;
cc0.stop();
}
}
}
}
24 changes: 24 additions & 0 deletions rxjava-core/src/test/java/rx/operators/OperationBufferTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static rx.operators.OperationBuffer.*;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
Expand All @@ -27,6 +28,8 @@
import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Mockito;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;

import rx.Observable;
import rx.Observer;
Expand Down Expand Up @@ -359,4 +362,25 @@ public void call() {
}
}, delay, TimeUnit.MILLISECONDS);
}

@Test
public void testBufferStopsWhenUnsubscribed1() {
Observable<Integer> source = Observable.never();

Observer<List<Integer>> o = mock(Observer.class);

Subscription s = source.buffer(100, 200, TimeUnit.MILLISECONDS, scheduler).subscribe(o);

InOrder inOrder = Mockito.inOrder(o);

scheduler.advanceTimeBy(1001, TimeUnit.MILLISECONDS);

inOrder.verify(o, times(5)).onNext(Arrays.<Integer>asList());

s.unsubscribe();

scheduler.advanceTimeBy(999, TimeUnit.MILLISECONDS);

inOrder.verifyNoMoreInteractions();
}
}