Add quotes for install_and_test to java benchmarks

Signed-off-by: acarbonetto <[email protected]>
Bit-Quill · Nov 8, 2023 · 05c40cf · 05c40cf
1 parent 76d3e9f
commit 05c40cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/benchmarks/install_and_test.sh b/benchmarks/install_and_test.sh
@@ -33,7 +33,7 @@ chosenClients="all"
 host="localhost"
 port=6379
 tlsFlag="--tls"
-javaTlsFlag="--tls"
+javaTlsFlag="-tls"
 
 function runPythonBenchmark(){
   # generate protobuf files
@@ -73,8 +73,8 @@ function runCSharpBenchmark(){
 
 function runJavaBenchmark(){
   cd ${BENCH_FOLDER}/../java
-  echo "./gradlew run --args=\"-resultsFile ${BENCH_FOLDER}/$1 -dataSize $2 -concurrentTasks $concurrentTasks -clientCount $clientCount -clients $chosenClients -host $host $javaPortFlag $javaTlsFlag $javaClusterFlag\""
-  ./gradlew run --args="-resultsFile \"${BENCH_FOLDER}/$1\" -dataSize $2 -concurrentTasks $concurrentTasks -clients $chosenClients -host $host $javaPortFlag -clientCount $clientCount $javaTlsFlag $javaClusterFlag"
+  echo "./gradlew run --args=\"-resultsFile ${BENCH_FOLDER}/$1 -dataSize \"$2\" -concurrentTasks \"$concurrentTasks\" -clientCount \"$clientCount\" -clients $chosenClients -host $host $javaPortFlag $javaTlsFlag $javaClusterFlag\""
+  ./gradlew run --args="-resultsFile \"${BENCH_FOLDER}/$1\" -dataSize \"$2\" -concurrentTasks \"$concurrentTasks\" -clients \"$chosenClients\" -host $host $javaPortFlag -clientCount \"$clientCount\" $javaTlsFlag $javaClusterFlag"
   cd ${BENCH_FOLDER}/java
 }
 
@@ -234,7 +234,7 @@ do
             ;;
         -is-cluster)
             clusterFlag="--clusterModeEnabled"
-            javaClusterFlag="--clusterModeEnabled"
+            javaClusterFlag="-clusterModeEnabled"
             ;;
         -port)
             portFlag="--port "$2

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java
@@ -197,7 +197,7 @@ private static int[] parseIntListOption(String line) throws ParseException {
       lineValue = lineValue.substring(1, lineValue.length() - 1);
     }
     // check if it's the correct format
-    if (!lineValue.matches("\\d+(\\s+\\d+)?")) {
+    if (!lineValue.matches("\\d+(\\s+\\d+)*")) {
       throw new ParseException("Invalid option: " + line);
     }
     // split the string into a list of integers