ソースを参照

[ci fw-only Java/act] Update benchmark config vesus for xxx-rythm test groups (#3250)

* add act-ebean-pgsql-rythm to compare rythm vs mustache template engine

* disable session resolve for the tests

* add hibernate tests

* jpa tests

* update README for act - add local test results for hibernate and eclipselink

* update README for act - add db tests comparing table between different technologies

* add tests for hibernate and eclipselink

* [ci fw-only Java/act] remove some test combinations from act

* add back tailored tests from Act as we found it should be caused by an act-ebean issue

* [ci fw-only Java/act] set-hibernate-mysql-rythm.sh shall use hibernate_mysql_rythm profile

* [ci fw-only Java/act] set database isolatetion level to READ_COMMITTED for all sql db tests

* [ci fw-only Java/act] disable eclipselink shared cache

* [ci fw-only Java/act] update benchmark config versus fields

* [ci fw-only Java/act] update benchmark config versus for xxx-rythm tests
Green Luo 7 年 前
コミット
d9f408812b

+ 7 - 7
frameworks/Java/act/benchmark_config.json

@@ -60,7 +60,7 @@
       "database_os": "Linux",
       "display_name": "act-ebean-pgsql",
       "notes": "",
-      "versus": "actframework-ebean-pgsql"
+      "versus": "undertow-postgresql"
     },
     "ebean-mysql": {
       "setup_file": "setup-ebean-mysql",
@@ -101,7 +101,7 @@
       "database_os": "Linux",
       "display_name": "act-ebean-mysql",
       "notes": "",
-      "versus": "actframework-ebean-mysql"
+      "versus": "undertow-mysql"
     },
     "hibernate-pgsql": {
       "setup_file": "setup-hibernate-pgsql",
@@ -142,7 +142,7 @@
       "database_os": "Linux",
       "display_name": "act-hibernate-pgsql",
       "notes": "",
-      "versus": "actframework-hibernate-pgsql"
+      "versus": "undertow-postgresql"
     },
     "hibernate-mysql": {
       "setup_file": "setup-hibernate-mysql",
@@ -183,7 +183,7 @@
       "database_os": "Linux",
       "display_name": "act-hibernate-mysql",
       "notes": "",
-      "versus": "actframework-hibernate-mysql"
+      "versus": "undertow-mysql"
     },
     "eclipselink-pgsql": {
       "setup_file": "setup-eclipselink-pgsql",
@@ -224,7 +224,7 @@
       "database_os": "Linux",
       "display_name": "act-eclipselink-pgsql",
       "notes": "",
-      "versus": "actframework-eclipselink-pgsql"
+      "versus": "undertow-postgresql"
     },
     "eclipselink-mysql": {
       "setup_file": "setup-eclipselink-mysql",
@@ -265,7 +265,7 @@
       "database_os": "Linux",
       "display_name": "act-eclipselink-mysql",
       "notes": "",
-      "versus": "actframework-eclipselink-mysql"
+      "versus": "undertow-mysql"
     },
     "morphia-mongo": {
       "setup_file": "setup-morphia-mongo",
@@ -306,7 +306,7 @@
       "database_os": "Linux",
       "display_name": "act-morphia",
       "notes": "",
-      "versus": "actframework-morphia-mongo"
+      "versus": "undertow-mongodb"
     }
   }]
 }

+ 0 - 1
frameworks/Java/act/src/main/java/com/techempower/act/AppEntry.java

@@ -23,7 +23,6 @@ package com.techempower.act;
 
 import act.Act;
 
-@SuppressWarnings("unused")
 public class AppEntry {
 
 	public static final String PROFILE_JSON_PLAINTEXT = "json_plaintext";

+ 0 - 1
frameworks/Java/act/src/main/java/com/techempower/act/controller/FortuneController.java

@@ -35,7 +35,6 @@ import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
 
-@SuppressWarnings("unused")
 @Env.RequireProfile(value = AppEntry.PROFILE_JSON_PLAINTEXT, except = true)
 public class FortuneController {
 

+ 0 - 1
frameworks/Java/act/src/main/java/com/techempower/act/controller/HelloWorldController.java

@@ -27,7 +27,6 @@ import com.alibaba.fastjson.JSON;
 import com.techempower.act.AppEntry;
 import org.osgl.http.H;
 
-@SuppressWarnings("unused")
 @Env.RequireProfile(value = AppEntry.PROFILE_JSON_PLAINTEXT)
 public class HelloWorldController {
 

+ 1 - 5
frameworks/Java/act/src/main/java/com/techempower/act/controller/WorldController.java

@@ -44,7 +44,6 @@ import java.util.concurrent.ThreadLocalRandom;
 import javax.inject.Inject;
 
 @AutoConfig
-@SuppressWarnings("unused")
 @Env.RequireProfile(value = AppEntry.PROFILE_JSON_PLAINTEXT, except = true)
 @ResponseContentType(H.MediaType.JSON)
 public class WorldController {
@@ -126,10 +125,7 @@ public class WorldController {
         }
         try {
             int val = Integer.parseInt(param);
-            if (val < 1) {
-                return 1;
-            }
-            return val > 500 ? 500 : val;
+            return val < 1 ? 1 : val > 500 ? 500 : val;
         } catch (NumberFormatException e) {
             return 1;
         }