Update 2.3.0 (#6513)

* Delete redkale-zgc.dockerfile

* Delete redkale-io.dockerfile

* Delete redkale.dockerfile

* Update and rename redkale-pgc.dockerfile to redkale.dockerfile

* Update redkale-cache.dockerfile

* Update redkale-postgres.dockerfile

* Update Service.java

* Update config.toml

* Update benchmark_config.json

* Update benchmark_config.json

* Update Service.java

* Update benchmark_config.json

* Create Message.java

* Update Service.java

* Update redkale-postgres.dockerfile

* Update pom.xml

* Update benchmark_config.json

* Update pom.xml

* Update FortunesTemplate.rocker.html

* Update FortunesTemplate.rocker.html

* Update benchmark_config.json

* Update application.xml

frameworks/Java/redkale/benchmark_config.json

@@ -39,11 +39,8 @@
                 "notes": "",
                 "versus": "Redkale"
             },
-            "postgres": {
+            "db": {
                 "db_url": "/db",
-                "fortune_url": "/fortunes",
-                "query_url": "/queries?q=",
-                "update_url": "/updates?q=",
                 "port": 8080,
                 "approach": "Realistic",
                 "classification": "Fullstack",
@@ -60,10 +57,8 @@
                 "notes": "",
                 "versus": "Redkale"
             },
-            "pgc": {
-                "plaintext_url": "/plaintext",
-                "json_url": "/json",
-                "cached_query_url": "/cached-worlds?q=",
+            "query": {
+                "query_url": "/queries?q=",
                 "port": 8080,
                 "approach": "Realistic",
                 "classification": "Fullstack",
@@ -76,14 +71,12 @@
                 "webserver": "Redkale",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "redkale-pgc",
+                "display_name": "redkale",
                 "notes": "",
                 "versus": "Redkale"
             },
-            "zgc": {
-                "plaintext_url": "/plaintext",
-                "json_url": "/json",
-                "cached_query_url": "/cached-worlds?q=",
+            "fortune": {
+                "fortune_url": "/fortunes",
                 "port": 8080,
                 "approach": "Realistic",
                 "classification": "Fullstack",
@@ -96,14 +89,12 @@
                 "webserver": "Redkale",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "redkale-zgc",
+                "display_name": "redkale",
                 "notes": "",
                 "versus": "Redkale"
             },
-            "io": {
-                "plaintext_url": "/plaintext",
-                "json_url": "/json",
-                "cached_query_url": "/cached-worlds?q=",
+            "update": {
+                "update_url": "/updates?q=",
                 "port": 8080,
                 "approach": "Realistic",
                 "classification": "Fullstack",
@@ -116,7 +107,7 @@
                 "webserver": "Redkale",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "redkale-io",
+                "display_name": "redkale",
                 "notes": "",
                 "versus": "Redkale"
             }

frameworks/Java/redkale/conf/application.xml

@@ -6,12 +6,13 @@
         <executor threads="0"/>
         <properties>    
             <property name="system.property.convert.tiny" value="false"/>    
+            <property name="system.property.net.invoker.max.onstack" value="24"/>
             <property name="system.property.http.response.header.server" value="redkale"/>
             <property name="system.property.http.response.header.connection" value="none"/>
         </properties>
     </resources> 
         
-    <server protocol="HTTP" iogroup="client" lazy="true" port="8080">      
+    <server protocol="HTTP" lazy="true" port="8080">      
         <response>
             <contenttype plain="text/plain" json="application/json"/>  
             <date period="1000"/>

frameworks/Java/redkale/config.toml

@@ -6,7 +6,7 @@ urls.plaintext = "/plaintext"
 urls.json = "/json"
 approach = "Realistic"
 classification = "Fullstack"
-database = "None"
+database = "Postgres"
 database_os = "Linux"
 os = "Linux"
 orm = "Raw"
@@ -26,11 +26,8 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[postgres]
+[db]
 urls.db = "/db"
-urls.fortune = "/fortunes"
-urls.query = "/queries?q="
-urls.update = "/updates?q="
 approach = "Realistic"
 classification = "Fullstack"
 database = "Postgres"
@@ -41,10 +38,8 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[pgc]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.cached_query = "/cached-worlds?q="
+[fortune]
+urls.fortune = "/fortunes"
 approach = "Realistic"
 classification = "Fullstack"
 database = "Postgres"
@@ -55,10 +50,8 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[zgc]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.cached_query = "/cached-worlds?q="
+[query]
+urls.query = "/queries?q="
 approach = "Realistic"
 classification = "Fullstack"
 database = "Postgres"
@@ -69,10 +62,8 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[io]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.cached_query = "/cached-worlds?q="
+[update]
+urls.update = "/updates?q="
 approach = "Realistic"
 classification = "Fullstack"
 database = "Postgres"

frameworks/Java/redkale/redkale-cache.dockerfile

@@ -1,15 +1,15 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.6.3-openjdk-16-slim as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM openjdk:11.0.3-jdk-slim
+FROM openjdk:16-jdk-slim
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dbenchmarks.cache=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=20000", "-Dbenchmarks.cache=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/redkale-pgc.dockerfile → frameworks/Java/redkale/redkale-db.dockerfile

@@ -12,4 +12,4 @@ COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=160000", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=20000", "-Dbenchmarks.db=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/redkale-zgc.dockerfile → frameworks/Java/redkale/redkale-fortune.dockerfile

@@ -12,4 +12,4 @@ COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC", "-XX:AutoBoxCacheMax=160000", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=20000", "-Dbenchmarks.db=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/redkale-io.dockerfile → frameworks/Java/redkale/redkale-query.dockerfile

@@ -1,15 +1,15 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.6.3-openjdk-16-slim as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM openjdk:11.0.3-jdk-slim
+FROM openjdk:16-jdk-slim
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dio.direct.fd=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=20000", "-Dbenchmarks.db=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/redkale-postgres.dockerfile → frameworks/Java/redkale/redkale-update.dockerfile

@@ -1,15 +1,15 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.6.3-openjdk-16-slim as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM openjdk:11.0.3-jdk-slim
+FROM openjdk:16-jdk-slim
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=20000", "-Dbenchmarks.db=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/redkale.dockerfile

@@ -1,15 +1,15 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.6.3-openjdk-16-slim as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM openjdk:11.0.3-jdk-slim
+FROM openjdk:16-jdk-slim
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-XX:AutoBoxCacheMax=320000", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=20000", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Message.java

@@ -14,6 +14,8 @@ import org.redkale.convert.json.JsonConvert;
  */
 public final class Message {
 
+    private static final Message instance = new Message();
+
     @ConvertSmallString
     private String message;
 
@@ -24,6 +26,11 @@ public final class Message {
         this.message = message;
     }
 
+    public static Message create(String str) {
+        instance.message = str;
+        return instance;
+    }
+
     public String getMessage() {
         return message;
     }

frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Service.java

@@ -31,8 +31,8 @@ public class Service extends AbstractService {
 
     @Override
     public void init(AnyValue conf) {
-        if (source instanceof DataSqlSource) {
-            this.cache = ((DataSqlSource) source).loadCache(CachedWorld.class);
+        if (Boolean.getBoolean("benchmarks.cache")) {
+            this.cache = ((DataSqlSource) source).loadCache(CachedWorld.class).array();
         }
     }
 
@@ -41,9 +41,9 @@ public class Service extends AbstractService {
         return helloBytes;
     }
 
-    @RestMapping(name = "json")
+    @RestMapping(name = "json", length = 27)
     public Message getHelloMessage() {
-        return new Message("Hello, World!");
+        return Message.create("Hello, World!");
     }
 
     @RestMapping(name = "db")
@@ -93,7 +93,7 @@ public class Service extends AbstractService {
         final int size = Math.min(500, Math.max(1, q));
         final CachedWorld[] worlds = new CachedWorld[size];
         for (int i = 0; i < size; i++) {
-            worlds[i] = cache.find(randomId());
+            worlds[i] = cache.findAt(randomId());
         }
         return worlds;
     }

frameworks/Java/redkale/src/main/templates/org/redkalex/benchmark/FortunesTemplate.rocker.html

@@ -1,18 +1,9 @@
 @import org.redkalex.benchmark.Fortune
 @import java.util.List
 @args(List<Fortune> fortunes)
-<!DOCTYPE html>
-<html>
+<!DOCTYPE html><html>
 <head><title>Fortunes</title></head>
-<body>
-<table>
-  <tr>
-    <th>id</th>
-    <th>message</th>
-  </tr> @for (fortune : fortunes) {
-  <tr>
-    <td>@fortune.getId()</td>
-    <td>@fortune.getMessage()</td>
-  </tr> } </table>
-</body>
-</html>
+<body><table>
+<tr><th>id</th><th>message</th></tr>@for (fortune : fortunes) {
+<tr><td>@fortune.getId()</td><td>@fortune.getMessage()</td></tr>} 
+</table></body></html>