Skip to content

Update ContinuablePagedFluxCore Page Retrieving Logic #15929

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

Merged
alzimmermsft merged 5 commits into from
Oct 5, 2020
Merged

Update ContinuablePagedFluxCore Page Retrieving Logic #15929

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0d18d3
Use expand instead of concatWith for PagedFlux page iteration
alzimmermsft Oct 2, 2020
acf0052
Changed to expand deep and added an initial capacity hint of 4 to red…
alzimmermsft Oct 2, 2020
8b1124a
Merge branch 'master' into AzCore_InvestigateMemoryLeaks
alzimmermsft Oct 3, 2020
26543a6
Change back to expand
alzimmermsft Oct 3, 2020
d05ab4c
Added documentation explaining why 4 was chosen as expand's second pa…
alzimmermsft Oct 5, 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
26 changes: 12 additions & 14 deletions sdk/core/azure-core/src/main/java/com/azure/core/util/paging/ContinuablePagedFluxCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,13 @@ public void subscribe(CoreSubscriber<? super T> coreSubscriber) {
* @param provider the provider that when called returns Page Retriever Function
* @param continuationToken the token to identify the pages to be retrieved
* @param pageSize the preferred page size
* @param <C> the type of Continuation token
* @param <T> The type of items in a {@link ContinuablePage}
* @param <P> The {@link ContinuablePage} holding items of type {@code T}
* @return a Flux of {@link ContinuablePage} identified by the given continuation token
*/
private static <C, T, P extends ContinuablePage<C, T>> Flux<P> byPage(Supplier<PageRetriever<C, P>> provider,
C continuationToken, Integer pageSize) {
private Flux<P> byPage(Supplier<PageRetriever<C, P>> provider, C continuationToken, Integer pageSize) {
return Flux.defer(() -> {
final PageRetriever<C, P> pageRetriever = provider.get();
final ContinuationState<C> state = new ContinuationState<>(continuationToken);
return concatFluxOfPage(state, pageRetriever, pageSize);
return retrievePages(state, pageRetriever, pageSize);
});
}

Expand All @@ -156,23 +152,25 @@ private static <C, T, P extends ContinuablePage<C, T>> Flux<P> byPage(Supplier<P
* @param state the state to be used across multiple Page Retriever Function calls
* @param pageRetriever the Page Retriever Function
* @param pageSize the preferred page size
* @param <C> the type of Continuation token
* @param <T> The type of items in a {@link ContinuablePage}
* @param <P> The {@link ContinuablePage} holding items of type {@code T}
* @return a Flux of {@link ContinuablePage}
*/
private static <C, T, P extends ContinuablePage<C, T>> Flux<P> concatFluxOfPage(ContinuationState<C> state,
PageRetriever<C, P> pageRetriever, Integer pageSize) {
private Flux<P> retrievePages(ContinuationState<C> state, PageRetriever<C, P> pageRetriever, Integer pageSize) {
return retrievePage(state, pageRetriever, pageSize)
Comment thread
anuchandy marked this conversation as resolved.
.expand(page -> {
state.setLastContinuationToken(page.getContinuationToken());
return Flux.defer(() -> retrievePage(state, pageRetriever, pageSize));
}, 4);
Comment thread
alzimmermsft marked this conversation as resolved.
}

private Flux<P> retrievePage(ContinuationState<C> state, PageRetriever<C, P> pageRetriever, Integer pageSize) {
if (state.isDone()) {
return Flux.empty();
} else {
return pageRetriever.get(state.getLastContinuationToken(), pageSize)
.switchIfEmpty(Flux.defer(() -> {
state.setLastContinuationToken(null);
return Mono.empty();
}))
.doOnNext(page -> state.setLastContinuationToken(page.getContinuationToken()))
.concatWith(Flux.defer(() -> concatFluxOfPage(state, pageRetriever, pageSize)));
}));
}
}
}