Browse Source

Improve plain text response + bump version (#8431)

* Improve plain text response + bump version

* Correct + bump Gradle

* Correct

* Add Vertx Graalvm native app
Denis Stepanov 1 year ago
parent
commit
bd4bfc7877

+ 23 - 0
frameworks/Java/micronaut/benchmark_config.json

@@ -25,6 +25,29 @@
         "notes": "",
         "notes": "",
         "versus": "None"
         "versus": "None"
       },
       },
+      "graalvm": {
+        "json_url": "/json",
+        "plaintext_url": "/plaintext",
+        "db_url": "/db",
+        "query_url": "/queries?queries=",
+        "fortune_url": "/fortunes",
+        "update_url": "/updates?queries=",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Micro",
+        "database": "Postgres",
+        "framework": "Micronaut",
+        "language": "Java",
+        "flavor": "None",
+        "orm": "raw",
+        "platform": "Netty",
+        "webserver": "None",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "Micronaut Vertx PG Client GraalVM",
+        "notes": "",
+        "versus": "None"
+      },
       "jdbc": {
       "jdbc": {
         "db_url": "/db",
         "db_url": "/db",
         "query_url": "/queries?queries=",
         "query_url": "/queries?queries=",

+ 4 - 2
frameworks/Java/micronaut/common/src/main/java/benchmark/controller/PlainTextController.java

@@ -4,13 +4,15 @@ import io.micronaut.http.MediaType;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.Get;
 
 
+import java.nio.charset.StandardCharsets;
+
 @Controller("/plaintext")
 @Controller("/plaintext")
 public class PlainTextController {
 public class PlainTextController {
 
 
-    private static final String TEXT = "Hello, World!";
+    private static final byte[] TEXT = "Hello, World!".getBytes(StandardCharsets.UTF_8);
 
 
     @Get(value = "/", produces = MediaType.TEXT_PLAIN)
     @Get(value = "/", produces = MediaType.TEXT_PLAIN)
-    public String getPlainText() {
+    public byte[] getPlainText() {
         return TEXT;
         return TEXT;
     }
     }
 }
 }

+ 17 - 17
frameworks/Java/micronaut/config.toml

@@ -73,23 +73,23 @@ platform = "Netty"
 webserver = "None"
 webserver = "None"
 versus = "micronaut-jdbc"
 versus = "micronaut-jdbc"
 
 
-#[vertx-pg-client-graalvm]
-#urls.plaintext = "/plaintext"
-#urls.json = "/json"
-#urls.db = "/db"
-#urls.query = "/queries?queries="
-#urls.update = "/updates?queries="
-#urls.fortune = "/fortunes"
-#approach = "Realistic"
-#classification = "Micro"
-#database = "Postgres"
-#database_os = "Linux"
-#display_name = "micronaut-vertx-pg-client-graalvm"
-#os = "Linux"
-#orm = "raw"
-#platform = "Netty"
-#webserver = "None"
-#versus = "micronaut"
+[vertx-pg-client-graalvm]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+urls.db = "/db"
+urls.query = "/queries?queries="
+urls.update = "/updates?queries="
+urls.fortune = "/fortunes"
+approach = "Realistic"
+classification = "Micro"
+database = "Postgres"
+database_os = "Linux"
+display_name = "micronaut-vertx-pg-client-graalvm"
+os = "Linux"
+orm = "raw"
+platform = "Netty"
+webserver = "None"
+versus = "micronaut"
 
 
 [jdbc-graalvm]
 [jdbc-graalvm]
 urls.plaintext = "/plaintext"
 urls.plaintext = "/plaintext"

+ 1 - 1
frameworks/Java/micronaut/gradle.properties

@@ -1 +1 @@
-micronautVersion = 4.0.5
+micronautVersion = 4.1.1

BIN
frameworks/Java/micronaut/gradle/wrapper/gradle-wrapper.jar


+ 2 - 1
frameworks/Java/micronaut/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip
 networkTimeout=10000
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists

+ 4 - 1
frameworks/Java/micronaut/gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
     fi
 else
 else
     JAVACMD=java
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 
 Please set the JAVA_HOME variable in your environment to match the
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 location of your Java installation."
+    fi
 fi
 fi
 
 
 # Increase the maximum file descriptors if we can.
 # Increase the maximum file descriptors if we can.

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-jdbc-graalvm.dockerfile

@@ -11,4 +11,4 @@ COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/native/nativeCompil
 
 
 EXPOSE 8080
 EXPOSE 8080
 ENV MICRONAUT_ENVIRONMENTS=benchmark
 ENV MICRONAUT_ENVIRONMENTS=benchmark
-ENTRYPOINT "./micronaut"
+ENTRYPOINT "./micronaut"

+ 0 - 3
frameworks/Java/micronaut/micronaut-vertx-pg-client/build.gradle

@@ -2,9 +2,6 @@ plugins {
     id 'io.micronaut.benchmark.module'
     id 'io.micronaut.benchmark.module'
 }
 }
 
 
-graalvmNative.binaries.configureEach {
-    buildArgs.add("--initialize-at-build-time=io.vertx.pgclient.impl.codec.DataTypeCodec")
-}
 micronaut {
 micronaut {
     testResources {
     testResources {
         additionalModules.add(JDBC_POSTGRESQL)
         additionalModules.add(JDBC_POSTGRESQL)