Browse Source

update redkale 19.2.4 (#3611)

Redkale 7 years ago
parent
commit
4077e7d658

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

@@ -11,7 +11,7 @@
       "update_url": "/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "None",
       "language": "Java",

+ 1 - 1
frameworks/Java/redkale/conf/application.xml

@@ -10,7 +10,7 @@
         </properties>
 	</resources> 
         
-    <server protocol="HTTP" host="0.0.0.0" port="8080" threads="2048" aliveTimeoutSecond="0">      
+    <server protocol="HTTP" host="0.0.0.0" port="8080" threads="4096" aliveTimeoutSeconds="-1">      
                 
         <response>
 			<contenttype plain="text/plain" json="application/json"/>    

+ 1 - 1
frameworks/Java/redkale/pom.xml

@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>org.redkale</groupId>
 			<artifactId>redkale</artifactId>
-			<version>1.9.2.3</version>
+			<version>1.9.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>

+ 16 - 24
frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Service.java

@@ -38,47 +38,39 @@ public class Service extends AbstractService {
     }
 
     @RestMapping(name = "db")
-    public CompletableFuture<World> findWorld() {
-        return source.findAsync(World.class, randomId());
+    public World findWorld() {
+        return source.find(World.class, randomId());
     }
 
     @RestMapping(name = "queries")
-    public CompletableFuture<World[]> queryWorld(@RestParam(name = "queries") int count) {
+    public World[] queryWorld(@RestParam(name = "queries") int count) {
         count = Math.min(500, Math.max(1, count));
         final World[] rs = new World[count];
-        final CompletableFuture<World>[] futures = new CompletableFuture[count];
         for (int i = 0; i < count; i++) {
-            final int index = i;
-            futures[index] = source.findAsync(World.class, randomId()).whenComplete((w, t) -> rs[index] = w);
+            rs[i] = source.find(World.class, randomId());
         }
-        return CompletableFuture.allOf(futures).thenApply((r) -> rs);
+        return rs;
     }
 
     @RestMapping(name = "updates")
-    public CompletableFuture<World[]> updateWorld(@RestParam(name = "queries") int count) {
+    public World[] updateWorld(@RestParam(name = "queries") int count) {
         count = Math.min(500, Math.max(1, count));
         final World[] rs = new World[count];
-        final CompletableFuture<World>[] futures = new CompletableFuture[count];
         for (int i = 0; i < count; i++) {
-            final int index = i;
-            futures[index] = source.findAsync(World.class, randomId()).whenComplete((w, t) -> {
-                rs[index] = w;
-                rs[index].setRandomNumber(randomId());
-            });
+            rs[i] = source.find(World.class, randomId());
+            rs[i].setRandomNumber(randomId());
         }
-        return CompletableFuture.allOf(futures).thenCompose((r) -> {
-            return source.updateAsync(rs).thenApply((v) -> rs);
-        });
+        source.update(rs);
+        return rs;
     }
 
     @RestMapping(name = "fortunes")
-    public CompletableFuture<HttpResult<String>> queryFortunes() {
-        return source.queryListAsync(Fortune.class).thenApply((fortunes) -> {
-            fortunes.add(new Fortune(0, "Additional fortune added at request time."));
-            Collections.sort(fortunes);
-            String html = FortunesTemplate.template(fortunes).render().toString();
-            return new HttpResult("text/html; charset=UTF-8", html);
-        });
+    public HttpResult<String> queryFortunes() {
+        List<Fortune> fortunes = source.queryList(Fortune.class);
+        fortunes.add(new Fortune(0, "Additional fortune added at request time."));
+        Collections.sort(fortunes);
+        String html = FortunesTemplate.template(fortunes).render().toString();
+        return new HttpResult("text/html; charset=UTF-8", html);
     }
 
     private int randomId() {