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

perf: replace concatMap to flatMapSequential to improve parallelism and efficiency #6706

Merged
merged 3 commits into from
Oct 10, 2024
Merged

perf: replace concatMap to flatMapSequential to improve parallelism and efficiency #6706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cbfd36
perf: replace concatMap to flatMapSequential to improve parallelism a…
guqing Sep 26, 2024
9a24818
chore: update code style
guqing Sep 26, 2024
e1d6c1c
fix: concatmap
guqing Oct 10, 2024
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 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/content/comment/CommentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public Mono<ListResult<ListedComment>> listComment(CommentQuery commentQuery) {
commentQuery.toPageRequest())
.flatMap(comments -> Flux.fromStream(comments.get()
.map(this::toListedComment))
.concatMap(Function.identity())
.flatMapSequential(Function.identity())
.collectList()
.map(list -> new ListResult<>(comments.getPage(), comments.getSize(),
comments.getTotal(), list)
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/content/comment/ReplyServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public Mono<ListResult<ListedReply>> list(ReplyQuery query) {
return client.listBy(Reply.class, query.toListOptions(), query.toPageRequest())
.flatMap(list -> Flux.fromStream(list.get()
.map(this::toListedReply))
.concatMap(Function.identity())
.flatMapSequential(Function.identity())
.collectList()
.map(listedReplies -> new ListResult<>(list.getPage(), list.getSize(),
list.getTotal(), listedReplies))
Expand Down
4 changes: 2 additions & 2 deletions application/src/main/java/run/halo/app/content/impl/PostServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public Mono<ListResult<ListedPost>> listPost(PostQuery query) {
)
.flatMap(listResult -> Flux.fromStream(listResult.get())
.map(this::getListedPost)
.concatMap(Function.identity())
.flatMapSequential(Function.identity())
.collectList()
.map(listedPosts -> new ListResult<>(listResult.getPage(), listResult.getSize(),
listResult.getTotal(), listedPosts)
Expand Down Expand Up @@ -175,7 +175,7 @@ private Flux<Contributor> listContributors(List<String> usernames) {
return Flux.empty();
}
return Flux.fromIterable(usernames)
.concatMap(userService::getUserOrGhost)
.flatMapSequential(userService::getUserOrGhost)
.map(user -> {
Contributor contributor = new Contributor();
contributor.setName(user.getMetadata().getName());
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/content/impl/SinglePageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public Flux<ListedSnapshotDto> listSnapshots(String pageName) {
public Mono<ListResult<ListedSinglePage>> list(SinglePageQuery query) {
return client.listBy(SinglePage.class, query.toListOptions(), query.toPageRequest())
.flatMap(listResult -> Flux.fromStream(listResult.get().map(this::getListedSinglePage))
.concatMap(Function.identity())
.flatMapSequential(Function.identity())
.collectList()
.map(listedSinglePages -> new ListResult<>(
listResult.getPage(),
Expand Down
10 changes: 6 additions & 4 deletions application/src/main/java/run/halo/app/core/user/service/impl/DefaultAttachmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public Mono<Attachment> upload(
.map(configMap -> new UploadOption(filePart, policy, configMap));
})
.flatMap(uploadContext -> extensionGetter.getExtensions(AttachmentHandler.class)
.concatMap(handler -> handler.upload(uploadContext))
.flatMapSequential(handler -> handler.upload(uploadContext))
.next())
.switchIfEmpty(Mono.error(() -> new ServerErrorException(
"No suitable handler found for uploading the attachment.", null)))
Expand Down Expand Up @@ -113,7 +113,7 @@ public Mono<Attachment> delete(Attachment attachment) {
.flatMap(policy -> client.get(ConfigMap.class, policy.getSpec().getConfigMapName())
.map(configMap -> new DeleteOption(attachment, policy, configMap)))
.flatMap(deleteOption -> extensionGetter.getExtensions(AttachmentHandler.class)
.concatMap(handler -> handler.delete(deleteOption))
.flatMapSequential(handler -> handler.delete(deleteOption))
.next());
}

Expand All @@ -122,7 +122,8 @@ public Mono<URI> getPermalink(Attachment attachment) {
return client.get(Policy.class, attachment.getSpec().getPolicyName())
.flatMap(policy -> client.get(ConfigMap.class, policy.getSpec().getConfigMapName())
.flatMap(configMap -> extensionGetter.getExtensions(AttachmentHandler.class)
.concatMap(handler -> handler.getPermalink(attachment, policy, configMap))
.flatMapSequential(
handler -> handler.getPermalink(attachment, policy, configMap))
.next()
)
);
Expand All @@ -133,7 +134,8 @@ public Mono<URI> getSharedURL(Attachment attachment, Duration ttl) {
return client.get(Policy.class, attachment.getSpec().getPolicyName())
.flatMap(policy -> client.get(ConfigMap.class, policy.getSpec().getConfigMapName())
.flatMap(configMap -> extensionGetter.getExtensions(AttachmentHandler.class)
.concatMap(handler -> handler.getSharedURL(attachment, policy, configMap, ttl))
.flatMapSequential(
handler -> handler.getSharedURL(attachment, policy, configMap, ttl))
.next()
)
);
Expand Down
2 changes: 1 addition & 1 deletion ...ication/src/main/java/run/halo/app/extension/router/ExtensionCompositeRouterFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public ExtensionCompositeRouterFunction(ReactiveExtensionClient client,
@NonNull
public Mono<HandlerFunction<ServerResponse>> route(@NonNull ServerRequest request) {
return Flux.fromIterable(getRouterFunctions())
.concatMap(routerFunction -> routerFunction.route(request))
.flatMapSequential(routerFunction -> routerFunction.route(request))
guqing marked this conversation as resolved.
Show resolved Hide resolved
.next();
}

Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/plugin/DefaultPluginRouterFunctionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public DefaultPluginRouterFunctionRegistry() {
public Mono<HandlerFunction<ServerResponse>> route(@NonNull ServerRequest request) {
var secureRequest = new SecureServerRequest(request);
return Flux.fromIterable(this.routerFunctions)
.concatMap(routerFunction -> routerFunction.route(secureRequest))
.flatMapSequential(routerFunction -> routerFunction.route(secureRequest))
guqing marked this conversation as resolved.
Show resolved Hide resolved
.next();
}

Expand Down
4 changes: 2 additions & 2 deletions application/src/main/java/run/halo/app/plugin/PluginServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public Flux<DataBuffer> uglifyJsBundle() {
});
var body = Flux.fromIterable(startedPlugins)
.sort(Comparator.comparing(PluginWrapper::getPluginId))
.concatMap(pluginWrapper -> {
.flatMapSequential(pluginWrapper -> {
var pluginId = pluginWrapper.getPluginId();
return Mono.<Resource>fromSupplier(
() -> BundleResourceUtils.getJsBundleResource(
Expand All @@ -274,7 +274,7 @@ public Flux<DataBuffer> uglifyJsBundle() {
public Flux<DataBuffer> uglifyCssBundle() {
return Flux.fromIterable(pluginManager.getStartedPlugins())
.sort(Comparator.comparing(PluginWrapper::getPluginId))
.concatMap(pluginWrapper -> {
.flatMapSequential(pluginWrapper -> {
var pluginId = pluginWrapper.getPluginId();
var dataBufferFactory = DefaultDataBufferFactory.sharedInstance;
return Mono.<Resource>fromSupplier(() -> BundleResourceUtils.getJsBundleResource(
Expand Down
4 changes: 2 additions & 2 deletions application/src/main/java/run/halo/app/plugin/extensionpoint/DefaultExtensionGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ private <T extends ExtensionPoint> Flux<T> getEnabledExtensions(String epdName,
}
var extensions = getExtensions(extensionPoint).cache();
return Flux.fromIterable(extensionDefNames)
.concatMap(extensionDefName ->
.flatMapSequential(extensionDefName ->
client.fetch(ExtensionDefinition.class, extensionDefName)
)
.concatMap(extensionDef -> {
.flatMapSequential(extensionDef -> {
var className = extensionDef.getSpec().getClassName();
return extensions.filter(
extension -> Objects.equals(extension.getClass().getName(),
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/dialect/GlobalHeadInjectionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected void doProcess(ITemplateContext context, IModel model,

// apply processors to modelToInsert
getTemplateHeadProcessors(context)
.concatMap(processor -> processor.process(
.flatMapSequential(processor -> processor.process(
guqing marked this conversation as resolved.
Show resolved Hide resolved
new SecureTemplateContext(context), modelToInsert, structureHandler)
)
.then()
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/dialect/TemplateFooterElementTagProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected void doProcess(ITemplateContext context, IProcessableElementTag tag,
modelToInsert.add(context.getModelFactory().createText(globalFooterText));

getTemplateFooterProcessors(context)
.concatMap(processor -> processor.process(
.flatMapSequential(processor -> processor.process(
guqing marked this conversation as resolved.
Show resolved Hide resolved
new SecureTemplateContext(context), tag, structureHandler, modelToInsert)
)
.then()
Expand Down
6 changes: 3 additions & 3 deletions application/src/main/java/run/halo/app/theme/finders/impl/CommentPublicQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public Mono<ListResult<CommentVo>> list(Ref ref, PageRequest pageParam) {
return client.listBy(Comment.class, listOptions, pageRequest)
.flatMap(listResult -> Flux.fromStream(listResult.get())
.map(this::toCommentVo)
.concatMap(Function.identity())
.flatMapSequential(Function.identity())
.collectList()
.map(commentVos -> new ListResult<>(listResult.getPage(),
listResult.getSize(),
Expand All @@ -102,7 +102,7 @@ public Mono<ListResult<CommentVo>> list(Ref ref, PageRequest pageParam) {
public Mono<ListResult<CommentWithReplyVo>> convertToWithReplyVo(ListResult<CommentVo> comments,
int replySize) {
return Flux.fromIterable(comments.getItems())
.concatMap(commentVo -> {
.flatMapSequential(commentVo -> {
var commentName = commentVo.getMetadata().getName();
return listReply(commentName, 1, replySize)
.map(replyList -> CommentWithReplyVo.from(commentVo)
Expand Down Expand Up @@ -135,7 +135,7 @@ public Mono<ListResult<ReplyVo>> listReply(String commentName, PageRequest pageP
.orElse(PageRequestImpl.ofSize(0));
return client.listBy(Reply.class, listOptions, pageRequest)
.flatMap(list -> Flux.fromStream(list.get().map(this::toReplyVo))
.concatMap(Function.identity())
.flatMapSequential(Function.identity())
.collectList()
.map(replyVos -> new ListResult<>(list.getPage(), list.getSize(),
list.getTotal(),
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ public Flux<ContributorVo> getContributors(List<String> names) {
return Flux.empty();
}
return Flux.fromIterable(names)
.concatMap(this::getContributor);
.flatMapSequential(this::getContributor);
}
}
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public Mono<ListResult<PostArchiveVo>> archives(Integer page, Integer size, Stri
public Flux<ListedPostVo> listAll() {
return postPredicateResolver.getListOptions()
.flatMapMany(listOptions -> client.listAll(Post.class, listOptions, defaultSort()))
.concatMap(postPublicQueryService::convertToListedVo);
.flatMapSequential(postPublicQueryService::convertToListedVo);
}

static int pageNullSafe(Integer page) {
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/finders/impl/PostPublicQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public Mono<ListResult<ListedPostVo>> list(ListOptions queryOptions, PageRequest
})
.flatMap(listOptions -> client.listBy(Post.class, listOptions, page))
.flatMap(list -> Flux.fromStream(list.get())
.concatMap(post -> convertToListedVo(post)
.flatMapSequential(post -> convertToListedVo(post)
.flatMap(postVo -> populateStats(postVo)
.doOnNext(postVo::setStats).thenReturn(postVo)
)
Expand Down
2 changes: 1 addition & 1 deletion ...cation/src/main/java/run/halo/app/theme/finders/impl/SinglePageConversionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public Mono<ListResult<ListedSinglePageVo>> listBy(ListOptions listOptions,

return client.listBy(SinglePage.class, rewroteListOptions, rewrotePageRequest)
.flatMap(list -> Flux.fromStream(list.get())
.concatMap(this::convertToListedVo)
.flatMapSequential(this::convertToListedVo)
.collectList()
.map(pageVos ->
new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), pageVos)
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Mono<TagVo> getByName(String name) {
@Override
public Flux<TagVo> getByNames(List<String> names) {
return Flux.fromIterable(names)
.concatMap(this::getByName);
.flatMapSequential(this::getByName);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/router/SinglePageRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class SinglePageRoute
@NonNull
public Mono<HandlerFunction<ServerResponse>> route(@NonNull ServerRequest request) {
return Flux.fromIterable(routerFunctions())
.concatMap(routerFunction -> routerFunction.route(request))
.flatMapSequential(routerFunction -> routerFunction.route(request))
.next();
}

Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/router/ThemeCompositeRouterFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class ThemeCompositeRouterFunction implements RouterFunction<ServerRespon
@NonNull
public Mono<HandlerFunction<ServerResponse>> route(@NonNull ServerRequest request) {
return Flux.fromIterable(cachedRouters)
.concatMap(routerFunction -> routerFunction.route(request))
.flatMapSequential(routerFunction -> routerFunction.route(request))
.next();
}

Expand Down
2 changes: 1 addition & 1 deletion application/src/main/java/run/halo/app/theme/router/factories/PostRouteFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private Mono<ServerResponse> postResponse(ServerRequest request,
Mono<String> determineTemplate(ServerRequest request, PostVo postVo) {
return Flux.fromIterable(defaultIfNull(postVo.getCategories(), List.of()))
.filter(category -> isNotBlank(category.getSpec().getPostTemplate()))
.concatMap(category -> viewNameResolver.resolveViewNameOrDefault(request,
.flatMapSequential(category -> viewNameResolver.resolveViewNameOrDefault(request,
category.getSpec().getPostTemplate(), null)
)
.next()
Expand Down
Loading