Micronaut performance improvements (#9049)

dstepanov · web-flow · commit 78cd8a7505a8 · 2024-05-23T07:49:38.000-07:00
* Performance improvements

* CR

* Correct benchmark_config.json
diff --git a/frameworks/Java/micronaut/benchmark_config.json b/frameworks/Java/micronaut/benchmark_config.json
@@ -16,9 +16,9 @@
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Raw",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut Vertx PG Client",
@@ -39,9 +39,9 @@
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Raw",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut Vertx PG Client GraalVM",
@@ -60,9 +60,9 @@
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Raw",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut JDBC",
@@ -81,9 +81,9 @@
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Raw",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut JDBC GraalVM",
@@ -102,9 +102,9 @@
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Raw",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut R2DBC",
@@ -123,9 +123,9 @@
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Raw",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut R2DBC GraalVM",
@@ -139,14 +139,14 @@
         "update_url": "/updates?queries=",
         "port": 8080,
         "approach": "Realistic",
-        "classification": "Micro",
+        "classification": "fullstack",
         "database": "Postgres",
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Micro",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut Data JDBC",
@@ -160,14 +160,14 @@
         "update_url": "/updates?queries=",
         "port": 8080,
         "approach": "Realistic",
-        "classification": "Micro",
+        "classification": "fullstack",
         "database": "Postgres",
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Micro",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut Data JDBC GraalVM",
@@ -181,14 +181,14 @@
         "update_url": "/updates?queries=",
         "port": 8080,
         "approach": "Realistic",
-        "classification": "Micro",
+        "classification": "fullstack",
         "database": "MongoDB",
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Micro",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut Data MongoDB",
@@ -202,14 +202,14 @@
         "update_url": "/updates?queries=",
         "port": 8080,
         "approach": "Realistic",
-        "classification": "Micro",
+        "classification": "fullstack",
         "database": "MongoDB",
         "framework": "Micronaut",
         "language": "Java",
         "flavor": "None",
-        "orm": "raw",
+        "orm": "Micro",
         "platform": "Netty",
-        "webserver": "None",
+        "webserver": "Netty",
         "os": "Linux",
         "database_os": "Linux",
         "display_name": "Micronaut Data MongoDB GraalVM",
diff --git a/frameworks/Java/micronaut/common/src/main/java/benchmark/controller/AsyncBenchmarkController.java b/frameworks/Java/micronaut/common/src/main/java/benchmark/controller/AsyncBenchmarkController.java
@@ -9,15 +9,12 @@
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.QueryValue;
-import io.micronaut.scheduling.TaskExecutors;
-import jakarta.inject.Named;
 import views.fortunes;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
 
 import static java.util.Comparator.comparing;
 
@@ -27,14 +24,11 @@ public class AsyncBenchmarkController extends AbstractBenchmarkController {
 
     private final AsyncWorldRepository worldRepository;
     private final AsyncFortuneRepository fortuneRepository;
-    private final Executor executor;
 
     public AsyncBenchmarkController(AsyncWorldRepository worldRepository,
-                                    AsyncFortuneRepository fortuneRepository,
-                                    @Named(TaskExecutors.BLOCKING) Executor executor) {
+                                    AsyncFortuneRepository fortuneRepository) {
         this.worldRepository = worldRepository;
         this.fortuneRepository = fortuneRepository;
-        this.executor = executor;
     }
 
     @Get("/prepare-data-for-test")
@@ -45,7 +39,7 @@ public CompletionStage<?> prepareDataForTest() {
     // https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Project-Information-Framework-Tests-Overview#single-database-query
     @Get("/db")
     public CompletionStage<World> db() {
-        return worldRepository.findById(randomId()).thenApplyAsync(world -> world, executor);
+        return worldRepository.findById(randomId());
     }
 
     // https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Project-Information-Framework-Tests-Overview#multiple-database-queries
@@ -56,20 +50,20 @@ public CompletionStage<List<World>> queries(@QueryValue String queries) {
         for (int i = 0; i < count; i++) {
             ids.add(randomId());
         }
-        return worldRepository.findByIds(ids).thenApplyAsync(worlds -> worlds, executor);
+        return worldRepository.findByIds(ids);
     }
 
     // https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Project-Information-Framework-Tests-Overview#fortunes
     @Get(value = "/fortunes", produces = "text/html;charset=utf-8")
     public CompletionStage<HttpResponse<String>> fortune() {
-        return fortuneRepository.findAll().thenApplyAsync(fortuneList -> {
+        return fortuneRepository.findAll().thenApply(fortuneList -> {
             List<Fortune> all = new ArrayList<>(fortuneList.size() + 1);
             all.add(new Fortune(0, "Additional fortune added at request time."));
             all.addAll(fortuneList);
             all.sort(comparing(Fortune::message));
             String body = fortunes.template(all).render().toString();
             return HttpResponse.ok(body).contentType("text/html;charset=utf-8");
-        }, executor);
+        });
     }
 
     // https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Project-Information-Framework-Tests-Overview#database-updates
@@ -80,7 +74,7 @@ public CompletionStage<List<World>> updates(@QueryValue String queries) {
                 world.setRandomNumber(randomWorldNumber());
             }
             worlds.sort(Comparator.comparingInt(World::getId)); // Avoid deadlock
-            return worldRepository.updateAll(worlds).thenApplyAsync(ignore -> worlds, executor);
+            return worldRepository.updateAll(worlds).thenApply(ignore -> worlds);
         });
     }
 
diff --git a/frameworks/Java/micronaut/common/src/main/java/benchmark/controller/BenchmarkController.java b/frameworks/Java/micronaut/common/src/main/java/benchmark/controller/BenchmarkController.java
@@ -9,8 +9,6 @@
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.QueryValue;
-import io.micronaut.scheduling.TaskExecutors;
-import io.micronaut.scheduling.annotation.ExecuteOn;
 import views.fortunes;
 
 import java.util.ArrayList;
@@ -20,7 +18,6 @@
 
 import static java.util.Comparator.comparing;
 
-@ExecuteOn(TaskExecutors.IO)
 @Requires(beans = {WorldRepository.class, FortuneRepository.class})
 @Controller
 public class BenchmarkController extends AbstractBenchmarkController {
diff --git a/frameworks/Java/micronaut/common/src/main/java/benchmark/filter/ServerHeaderFilter.java b/frameworks/Java/micronaut/common/src/main/java/benchmark/filter/ServerHeaderFilter.java
@@ -4,7 +4,9 @@
 import io.micronaut.http.annotation.Filter;
 import io.micronaut.http.annotation.ResponseFilter;
 import io.micronaut.http.annotation.ServerFilter;
+import io.micronaut.http.netty.NettyHttpHeaders;
 import io.micronaut.scheduling.annotation.Scheduled;
+import io.netty.handler.codec.http.HttpHeaderNames;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -25,7 +27,8 @@ public void setDateHeader() {
 
     @ResponseFilter
     public void addDateHeader(MutableHttpResponse<?> mutableHttpResponse) {
-        mutableHttpResponse.header("Date", dateHeader);
+        NettyHttpHeaders nettyHttpHeaders = (NettyHttpHeaders) mutableHttpResponse.getHeaders();
+        nettyHttpHeaders.setUnsafe(HttpHeaderNames.DATE, dateHeader);
     }
 
 }
diff --git a/frameworks/Java/micronaut/common/src/main/resources/application-benchmark.yml b/frameworks/Java/micronaut/common/src/main/resources/application-benchmark.yml
@@ -5,6 +5,7 @@ micronaut:
     port: 8080
     server-header: Micronaut
     date-header: false
+    validate-url: false
   http:
     client:
       read-timeout: 60s
diff --git a/frameworks/Java/micronaut/common/src/main/resources/application-common.yml b/frameworks/Java/micronaut/common/src/main/resources/application-common.yml
@@ -5,6 +5,7 @@ micronaut:
     port: 8080
     server-header: Micronaut
     date-header: false
+    validate-url: false
 
 netty:
   resource-leak-detector-level: DISABLED
@@ -17,7 +18,7 @@ datasources:
     driverClassName: org.postgresql.Driver
     db-type: postgresql
     dialect: POSTGRES
-    maximum-pool-size: 48
+    maximum-pool-size: 512
     transaction-per-operation: false
     allow-connection-per-operation: true
 
@@ -29,7 +30,7 @@ r2dbc:
       options:
         protocol: postgres
         initialSize: 0 # https://github.com/micronaut-projects/micronaut-data/issues/2136
-        maxSize: 48
+        maxSize: 512
 
 mongodb:
   package-names:
diff --git a/frameworks/Java/micronaut/micronaut-data-jdbc.dockerfile b/frameworks/Java/micronaut/micronaut-data-jdbc.dockerfile
@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.7.0-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-jdbc:build -x test --no-daemon
 
-FROM openjdk:21
+FROM openjdk:22
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/libs/micronaut-data-jdbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
diff --git a/frameworks/Java/micronaut/micronaut-data-mongodb.dockerfile b/frameworks/Java/micronaut/micronaut-data-mongodb.dockerfile
@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.7.0-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-mongodb:build -x test --no-daemon
 
-FROM openjdk:21
+FROM openjdk:22
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-mongodb/build/libs/micronaut-data-mongodb-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
diff --git a/frameworks/Java/micronaut/micronaut-data-r2dbc.dockerfile b/frameworks/Java/micronaut/micronaut-data-r2dbc.dockerfile
@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.7.0-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-data-r2dbc:build -x test --no-daemon
 
-FROM openjdk:21
+FROM openjdk:22
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-r2dbc/build/libs/micronaut-data-r2dbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
diff --git a/frameworks/Java/micronaut/micronaut-jdbc.dockerfile b/frameworks/Java/micronaut/micronaut-jdbc.dockerfile
@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.7.0-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-jdbc:build -x test --no-daemon
 
-FROM openjdk:21
+FROM openjdk:22
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-jdbc/build/libs/micronaut-jdbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
diff --git a/frameworks/Java/micronaut/micronaut-r2dbc.dockerfile b/frameworks/Java/micronaut/micronaut-r2dbc.dockerfile
@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk17 as build
+FROM gradle:8.7.0-jdk21 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 RUN gradle micronaut-r2dbc:build -x test --no-daemon
 
-FROM openjdk:21
+FROM openjdk:22
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-r2dbc/build/libs/micronaut-r2dbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
diff --git a/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/AbstractVertxSqlClientRepository.java b/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/AbstractVertxSqlClientRepository.java
@@ -7,6 +7,7 @@
 import io.vertx.sqlclient.RowSet;
 import io.vertx.sqlclient.SqlClient;
 import io.vertx.sqlclient.Tuple;
+import jakarta.inject.Inject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,23 +16,20 @@
 
 public class AbstractVertxSqlClientRepository {
 
-    protected final Pool client;
-
-    public AbstractVertxSqlClientRepository(Pool client) {
-        this.client = client;
-    }
+    @Inject
+    protected ConnectionHolder holder;
 
     protected CompletionStage<?> execute(String sql) {
-        return client.preparedQuery(sql).execute().toCompletionStage();
+        return holder.get().flatMap(conn->conn.preparedQuery(sql).execute()).toCompletionStage();
     }
 
     protected <T> CompletionStage<T> executeAndCollectOne(String sql, Tuple tuple, Function<Row, T> mapper) {
-        return client.preparedQuery(sql).execute(tuple).map(rows -> mapper.apply(rows.iterator().next()))
+        return holder.get().flatMap(conn->conn.preparedQuery(sql).execute(tuple).map(rows -> mapper.apply(rows.iterator().next())))
                 .toCompletionStage();
     }
 
     protected <T> CompletionStage<List<T>> executeAndCollectList(String sql, Function<Row, T> mapper) {
-        return client.preparedQuery(sql).execute().map(rows -> {
+        return holder.get().flatMap(conn->conn.preparedQuery(sql).execute()).map(rows -> {
             List<T> result = new ArrayList<>(rows.size());
             for (Row row : rows) {
                 result.add(mapper.apply(row));
@@ -52,7 +50,7 @@ protected <T> Future<List<T>> executeMany(SqlClient sqlClient, String sql, List<
     }
 
     protected CompletionStage<?> executeBatch(String sql, List<Tuple> data) {
-        return client.preparedQuery(sql).executeBatch(data).toCompletionStage();
+        return holder.get().flatMap(conn->conn.preparedQuery(sql).executeBatch(data)).toCompletionStage();
     }
 
 }
diff --git a/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/ConnectionHolder.java b/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/ConnectionHolder.java
diff --git a/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/PgClientFactory.java b/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/PgClientFactory.java
diff --git a/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/VertxPgFortuneRepository.java b/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/VertxPgFortuneRepository.java
diff --git a/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/VertxPgWorldRepository.java b/frameworks/Java/micronaut/micronaut-vertx-pg-client/src/main/java/benchmark/VertxPgWorldRepository.java
diff --git a/frameworks/Java/micronaut/micronaut.dockerfile b/frameworks/Java/micronaut/micronaut.dockerfile
diff --git a/frameworks/Java/micronaut/run_benchmark.sh b/frameworks/Java/micronaut/run_benchmark.sh
