Forráskód Böngészése

update graalvm 22.0 (#7181)

Redkale 3 éve
szülő
commit
371249cf5e

+ 3 - 3
frameworks/Java/redkale/benchmark_config.json

@@ -27,7 +27,7 @@
                 "db_url": "/db",
                 "query_url": "/queries?q=", 
                 "fortune_url": "/fortunes",
-                "update_url2": "/updates?q=",
+                "update_url": "/updates?q=",
                 "cached_query_url": "/cached-worlds?q=",
                 "port": 8080,
                 "approach": "Realistic",
@@ -91,7 +91,7 @@
                 "db_url": "/db",
                 "query_url": "/queries?q=", 
                 "fortune_url": "/fortunes",
-                "update_url2": "/updates?q=",
+                "update_url": "/updates?q=",
                 "port": 8080,
                 "approach": "Realistic",
                 "classification": "Fullstack",
@@ -104,7 +104,7 @@
                 "webserver": "Redkale",
                 "os": "Linux",
                 "database_os": "Linux",
-                "display_name": "redkale-postgres",
+                "display_name": "redkale",
                 "notes": "",
                 "versus": "Redkale"
             },

+ 2 - 2
frameworks/Java/redkale/config.toml

@@ -20,7 +20,7 @@ urls.json = "/json"
 urls.db = "/db"
 urls.fortune = "/fortunes"
 urls.query = "/queries?q="
-urls.update2 = "/updates?q="
+urls.update = "/updates?q="
 urls.cached_query = "/cached-worlds?q="
 approach = "Realistic"
 classification = "Fullstack"
@@ -66,7 +66,7 @@ versus = "Redkale"
 urls.db = "/db"
 urls.fortune = "/fortunes"
 urls.query = "/queries?q="
-urls.update2 = "/updates?q="
+urls.update = "/updates?q="
 approach = "Realistic"
 classification = "Fullstack"
 database = "Postgres"

+ 1 - 1
frameworks/Java/redkale/redkale-graalvm.dockerfile

@@ -6,7 +6,7 @@ COPY pom.xml pom.xml
 RUN mvn package -q
 
 
-FROM ghcr.io/graalvm/graalvm-ce:21.3.0
+FROM instructure/graalvm-ce:22-java17
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar

+ 1 - 1
frameworks/Java/redkale/redkale-native.dockerfile

@@ -6,7 +6,7 @@ COPY pom.xml pom.xml
 RUN mvn package -q
 
 
-FROM ghcr.io/graalvm/graalvm-ce:21.3.0 
+FROM ghcr.io/graalvm/graalvm-ce:21.3.0
 RUN gu install native-image
 WORKDIR /redkale
 COPY conf conf

+ 7 - 4
frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/BenchmarkService.java

@@ -5,6 +5,7 @@
  */
 package org.redkalex.benchmark;
 
+import java.util.List;
 import java.util.concurrent.*;
 import java.util.stream.*;
 import javax.annotation.Resource;
@@ -46,18 +47,20 @@ public class BenchmarkService extends AbstractService {
     }
 
     @RestMapping(name = "queries")
-    public CompletableFuture<World[]> queryWorldAsync(int q) {
+    public CompletableFuture<List<World>> queryWorldAsync(int q) {
         int size = Math.min(500, Math.max(1, q));
         IntStream ids = ThreadLocalRandom.current().ints(size, 1, 10001);
-        return source.findsAsync(World.class, ids.boxed());
+        return source.findsListAsync(World.class, ids.boxed());
     }
 
     @RestMapping(name = "updates")
-    public CompletableFuture<World[]> updateWorldAsync(int q) {
+    public CompletableFuture<List<World>> updateWorldAsync(int q) {
         int size = Math.min(500, Math.max(1, q));
         IntStream ids = ThreadLocalRandom.current().ints(size, 1, 10001);
         int[] newNumbers = ThreadLocalRandom.current().ints(size, 1, 10001).toArray();
-        return source.findsAsync(World.class, ids.boxed()).thenCompose(words -> source.updateAsync(World.setNewNumbers(words, newNumbers)).thenApply(v -> words));
+        return source.findsListAsync(World.class, ids.boxed())
+            .thenCompose(words -> source.updateAsync(World.setNewNumbers(words.toArray(new World[words.size()]), newNumbers))
+            .thenApply(v -> words));
     }
 
     @RestMapping(name = "fortunes")