Merge pull request #6 from TechEmpower/master

aa
TechEmpower · Mar 17, 2021 · 94f7760 · 94f7760
2 parents 1d9c0aa + 59a7484
commit 94f7760
Show file tree

Hide file tree

Showing 76 changed files with 920 additions and 506 deletions.
diff --git a/frameworks/Java/redkale/benchmark_config.json b/frameworks/Java/redkale/benchmark_config.json
@@ -1,83 +1,84 @@
 {
-  "framework": "redkale",
-  "tests": [{
-    "default": {
-      "plaintext_url": "/plaintext",   
-      "json_url": "/json",   
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "Redkale",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Raw",
-      "platform": "Redkale",
-      "webserver": "Redkale",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "redkale",
-      "notes": "",
-      "versus": "Redkale"
-    },
-	"postgres": {
-      "db_url": "/db",
-      "fortune_url": "/fortunes",
-      "query_url": "/queries?q=",
-      "update_url": "/updates?q=",
-      "cached_query_url": "/cached-worlds?q=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "Redkale",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Raw",
-      "platform": "Redkale",
-      "webserver": "Redkale",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "redkale",
-      "notes": "",
-      "versus": "Redkale"
-    },
-	"io": {
-      "plaintext_url": "/plaintext",   
-      "json_url": "/json",   
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "Redkale",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Raw",
-      "platform": "Redkale",
-      "webserver": "Redkale",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "redkale",
-      "notes": "",
-      "versus": "Redkale"
-    },
-	"json": { 
-      "json_url": "/json",   
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "Redkale",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Raw",
-      "platform": "Redkale",
-      "webserver": "Redkale",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "redkale",
-      "notes": "",
-      "versus": "Redkale"
-    }
-  }]
+    "framework": "redkale",
+    "tests": [
+        {
+            "default": {
+                "plaintext_url": "/plaintext",
+                "json_url": "/json",
+                "port": 8080,
+                "approach": "Realistic",
+                "classification": "Fullstack",
+                "database": "Postgres",
+                "framework": "Redkale",
+                "language": "Java",
+                "flavor": "None",
+                "orm": "Raw",
+                "platform": "Redkale",
+                "webserver": "Redkale",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "redkale",
+                "notes": "",
+                "versus": "Redkale"
+            },
+            "cache": {
+                "cached_query_url": "/cached-worlds?q=",
+                "port": 8080,
+                "approach": "Realistic",
+                "classification": "Fullstack",
+                "database": "Postgres",
+                "framework": "Redkale",
+                "language": "Java",
+                "flavor": "None",
+                "orm": "Raw",
+                "platform": "Redkale",
+                "webserver": "Redkale",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "redkale",
+                "notes": "",
+                "versus": "Redkale"
+            },
+            "postgres": {
+                "db_url": "/db",
+                "fortune_url": "/fortunes",
+                "query_url": "/queries?q=",
+                "update_url": "/updates?q=",
+                "port": 8080,
+                "approach": "Realistic",
+                "classification": "Fullstack",
+                "database": "Postgres",
+                "framework": "Redkale",
+                "language": "Java",
+                "flavor": "None",
+                "orm": "Raw",
+                "platform": "Redkale",
+                "webserver": "Redkale",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "redkale",
+                "notes": "",
+                "versus": "Redkale"
+            },
+            "io": {
+                "plaintext_url": "/plaintext",
+                "json_url": "/json",
+                "port": 8080,
+                "approach": "Realistic",
+                "classification": "Fullstack",
+                "database": "Postgres",
+                "framework": "Redkale",
+                "language": "Java",
+                "flavor": "None",
+                "orm": "Raw",
+                "platform": "Redkale",
+                "webserver": "Redkale",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "redkale-io",
+                "notes": "",
+                "versus": "Redkale"
+            }
+        }
+    ]
 }
diff --git a/frameworks/Java/redkale/conf/application.xml b/frameworks/Java/redkale/conf/application.xml
@@ -10,7 +10,7 @@
         </properties>
     </resources> 
 
-    <server protocol="HTTP" lazy="true" port="8080">      
+    <server protocol="HTTP" iogroup="" lazy="true" port="8080">      
         <response>
             <contenttype plain="text/plain" json="application/json"/>  
             <date period="1000"/>

diff --git a/frameworks/Java/redkale/config.toml b/frameworks/Java/redkale/config.toml
@@ -14,11 +14,7 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[postgres]
-urls.db = "/db"
-urls.fortune = "/fortunes"
-urls.query = "/queries?q="
-urls.update = "/updates?q="
+[cache]
 urls.cached_query = "/cached-worlds?q="
 approach = "Realistic"
 classification = "Fullstack"
@@ -30,20 +26,23 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[io]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
+[postgres]
+urls.db = "/db"
+urls.fortune = "/fortunes"
+urls.query = "/queries?q="
+urls.update = "/updates?q="
 approach = "Realistic"
 classification = "Fullstack"
-database = "None"
+database = "Postgres"
 database_os = "Linux"
 os = "Linux"
 orm = "Raw"
 platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[json]
+[io]
+urls.plaintext = "/plaintext"
 urls.json = "/json"
 approach = "Realistic"
 classification = "Fullstack"

diff --git a/...orks/Java/redkale/redkale-json.dockerfile → ...rks/Java/redkale/redkale-cache.dockerfile b/...orks/Java/redkale/redkale-json.dockerfile → ...rks/Java/redkale/redkale-cache.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=80000", "-XX:BiasedLockingStartupDelay=500", "-Djson.direct.test=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dbenchmarks.cache=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
diff --git a/frameworks/Java/redkale/redkale-io.dockerfile b/frameworks/Java/redkale/redkale-io.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=80000", "-XX:BiasedLockingStartupDelay=500", "-Dio.direct.fd=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dio.direct.fd=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
diff --git a/frameworks/Java/redkale/redkale-postgres.dockerfile b/frameworks/Java/redkale/redkale-postgres.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=80000", "-XX:BiasedLockingStartupDelay=500", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
diff --git a/frameworks/Java/redkale/redkale.dockerfile b/frameworks/Java/redkale/redkale.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=80000", "-XX:BiasedLockingStartupDelay=500", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
diff --git a/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/CachedWorld.java b/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/CachedWorld.java
@@ -6,13 +6,51 @@
 package org.redkalex.benchmark;
 
 import javax.persistence.*;
+import org.redkale.convert.json.JsonConvert;
+
 
 /**
  *
  * @author zhangjx
  */
 @Cacheable(direct=true)
 @Table(name = "World")
-public class CachedWorld extends World {
+public final class CachedWorld implements Comparable<CachedWorld> {
+
+    @Id
+    private int id;
+
+    private int randomNumber;
+
+    public CachedWorld randomNumber(int randomNumber) {
+        this.randomNumber = randomNumber;
+        return this;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getRandomNumber() {
+        return randomNumber;
+    }
+
+    public void setRandomNumber(int randomNumber) {
+        this.randomNumber = randomNumber;
+    }
+
+    @Override
+    public int compareTo(CachedWorld o) {
+        return Integer.compare(id, o.id);
+    }
+
+    @Override
+    public String toString() {
+        return JsonConvert.root().convertTo(this);
+    }
 
 }
diff --git a/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Fortune.java b/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Fortune.java
@@ -12,7 +12,7 @@
  *
  * @author zhangjx
  */
-public class Fortune implements Comparable<Fortune> {
+public final class Fortune implements Comparable<Fortune> {
 
     @Id
     private int id;

diff --git a/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Message.java b/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Message.java
@@ -12,7 +12,7 @@
  *
  * @author zhangjx
  */
-public class Message {
+public final class Message {
 
     @ConvertSmallString
     private String message;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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=80000", "-XX:BiasedLockingStartupDelay=500", "-Djson.direct.test=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
		CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dbenchmarks.cache=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]