Browse Source

fix ci issues

Gelin Luo 8 years ago
parent
commit
52d7be095c

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

@@ -26,7 +26,7 @@
       "db_url": "/pgsql/db",
       "query_url": "/pgsql/queries?queries=",
       "fortune_url": "/pgsql/fortunes",
-      "update_url": "/pgsql/update?queries=",
+      "update_url": "/pgsql/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
@@ -48,7 +48,7 @@
       "db_url": "/mysql/db",
       "query_url": "/mysql/queries?queries=",
       "fortune_url": "/mysql/fortunes",
-      "update_url": "/mysql/update?queries=",
+      "update_url": "/mysql/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
@@ -70,7 +70,7 @@
       "db_url": "/mongo/db",
       "query_url": "/mongo/queries?queries=",
       "fortune_url": "/mongo/fortunes",
-      "update_url": "/mongo/update?queries=",
+      "update_url": "/mongo/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",

+ 10 - 5
frameworks/Java/act/src/main/java/com/techempower/act/controller/WorldControllerBase.java

@@ -35,7 +35,7 @@ public abstract class WorldControllerBase<MODEL_TYPE extends IWorld,
 	}
 
 	@GetAction("queries")
-	public final void multipleQueries(Integer queries) {
+	public final void multipleQueries(String queries) {
 		int q = regulateQueries(queries);
 
 		List<IWorld> retVal = new ArrayList<>();
@@ -46,7 +46,7 @@ public abstract class WorldControllerBase<MODEL_TYPE extends IWorld,
 	}
 
 	@GetAction("updates")
-	public final void updateQueries(Integer queries) {
+	public final void updateQueries(String queries) {
 		int q = regulateQueries(queries);
 		List<IWorld> retVal = new ArrayList<>();
 		for (int i = 0; i < q; ++i) {
@@ -61,14 +61,19 @@ public abstract class WorldControllerBase<MODEL_TYPE extends IWorld,
 
 	protected abstract MODEL_TYPE findAndModifyOne();
 
-	protected final int regulateQueries(Integer param) {
+	private int regulateQueries(String param) {
 		if (null == param) {
 			return 1;
 		}
-		if (param < 1) {
+		try {
+			int val = Integer.parseInt(param);
+			if (val < 1) {
+				return 1;
+			}
+			return val > 500 ? 500 : val;
+		} catch (NumberFormatException e) {
 			return 1;
 		}
-		return param > 500 ? 500 : param;
 	}
 
 	protected final int randomWorldNumber() {