Skip to content

Commit 57dbf3c

Browse files
Merge pull request #1645 from benjchristensen/remove-parallel-merge
Remove ParallelMerge
2 parents 6de88d2 + 7cd3938 commit 57dbf3c

File tree

3 files changed

+0
-273
lines changed

3 files changed

+0
-273
lines changed

src/main/java/rx/Observable.java

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2326,62 +2326,6 @@ public final static <T> Observable<T> never() {
23262326
return new NeverObservable<T>();
23272327
}
23282328

2329-
/**
2330-
* Converts an {@code Observable<Observable<T>>} into another {@code Observable<Observable<T>>} whose
2331-
* emitted Observables emit the same items as those emitted by the source Observable, but where the number
2332-
* of such Observables is restricted by {@code parallelObservables}.
2333-
* <p>
2334-
* For example, if the original {@code Observable<Observable<T>>} emits 100 Observables and
2335-
* {@code parallelObservables} is 8, the items emitted by the 100 original Observables will be distributed
2336-
* among 8 Observables emitted by the resulting Observable.
2337-
* <p>
2338-
* <img width="640" height="535" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelMerge.png" alt="">
2339-
* <p>
2340-
* This is a mechanism for efficiently processing <i>n</i> number of Observables on a smaller <i>m</i>
2341-
* number of resources (typically CPU cores).
2342-
* <dl>
2343-
* <dt><b>Scheduler:</b></dt>
2344-
* <dd>{@code parallelMerge} by default operates on the {@code immediate} {@link Scheduler}.</dd>
2345-
* </dl>
2346-
*
2347-
* @param parallelObservables
2348-
* the number of Observables to merge into
2349-
* @return an Observable of Observables constrained in number by {@code parallelObservables}
2350-
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Combining-Observables#parallelmerge">RxJava wiki: parallelMerge</a>
2351-
*/
2352-
public final static <T> Observable<Observable<T>> parallelMerge(Observable<Observable<T>> source, int parallelObservables) {
2353-
return OperatorParallelMerge.parallelMerge(source, parallelObservables);
2354-
}
2355-
2356-
/**
2357-
* Converts an {@code Observable<Observable<T>>} into another {@code Observable<Observable<T>>} whose
2358-
* emitted Observables emit the same items as those emitted by the source Observable, but where the number
2359-
* of such Observables is restricted by {@code parallelObservables}, and each runs on a defined Scheduler.
2360-
* <p>
2361-
* For example, if the original {@code Observable<Observable<T>>} emits 100 Observables and
2362-
* {@code parallelObservables} is 8, the items emitted by the 100 original Observables will be distributed
2363-
* among 8 Observables emitted by the resulting Observable.
2364-
* <p>
2365-
* <img width="640" height="535" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelMerge.png" alt="">
2366-
* <p>
2367-
* This is a mechanism for efficiently processing <i>n</i> number of Observables on a smaller <i>m</i>
2368-
* number of resources (typically CPU cores).
2369-
* <dl>
2370-
* <dt><b>Scheduler:</b></dt>
2371-
* <dd>you specify which {@link Scheduler} this operator will use</dd>
2372-
* </dl>
2373-
*
2374-
* @param parallelObservables
2375-
* the number of Observables to merge into
2376-
* @param scheduler
2377-
* the {@link Scheduler} to run each Observable on
2378-
* @return an Observable of Observables constrained in number by {@code parallelObservables}
2379-
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Combining-Observables#parallelmerge">RxJava wiki: parallelMerge</a>
2380-
*/
2381-
public final static <T> Observable<Observable<T>> parallelMerge(Observable<Observable<T>> source, int parallelObservables, Scheduler scheduler) {
2382-
return OperatorParallelMerge.parallelMerge(source, parallelObservables, scheduler);
2383-
}
2384-
23852329
/**
23862330
* Returns an Observable that emits a sequence of Integers within a specified range.
23872331
* <p>

src/main/java/rx/internal/operators/OperatorParallelMerge.java

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/test/java/rx/internal/operators/OperatorParallelMergeTest.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)