Merge remote-tracking branch 'origin/java_benchmarks' into uniffi-kot…

…lin-and-java Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Oct 16, 2023 · ee49d23 · ee49d23
2 parents 1089194 + 540f49a
commit ee49d23
Show file tree

Hide file tree

Showing 23 changed files with 1,035 additions and 125 deletions.
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -40,6 +40,7 @@ jobs:
           sudo apt install -y protobuf-compiler
           mkdir -p java/client/src/main/java/org/babushka/javababushka/generated
           protoc -Iprotobuf=babushka-core/src/protobuf/ --java_out=java/client/src/main/java/org/babushka/javababushka/generated babushka-core/src/protobuf/*.proto
+
       - name: Build rust part
         working-directory: java
         run: cargo build

diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/benchmarks/install_and_test.sh b/benchmarks/install_and_test.sh
@@ -24,12 +24,14 @@ runAllBenchmarks=1
 runPython=0
 runNode=0
 runCsharp=0
+runJava=0
 runRust=0
 concurrentTasks="1 10 100 1000"
 dataSize="100 4000"
 clientCount="1"
 chosenClients="all"
 host="localhost"
+port=6379
 tlsFlag="--tls"
 
 function runPythonBenchmark(){
@@ -68,6 +70,22 @@ function runCSharpBenchmark(){
   dotnet run --configuration Release --resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --clientCount $clientCount $tlsFlag $portFlag
 }
 
+function runJavaBenchmark(){
+  cd ${BENCH_FOLDER}/../java
+  echo "./gradlew run --args=\"--resultsFile=${BENCH_FOLDER}/$1 --clients $chosenClients --host $host --port $port\""
+#  ./gradlew run --args="--resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --port $port --clientCount $clientCount $tlsFlag"
+  ./gradlew run --args="--resultsFile=${BENCH_FOLDER}/$1 --clients $chosenClients --host $host --port $port"
+  cd ${BENCH_FOLDER}/java
+}
+
+function runJavaBenchmark(){
+  cd ${BENCH_FOLDER}/../java
+  echo "./gradlew run --args=\"--resultsFile=${BENCH_FOLDER}/$1 --clients $chosenClients --host $host --port $port\""
+#  ./gradlew run --args="--resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --port $port --clientCount $clientCount $tlsFlag"
+  ./gradlew run --args="--resultsFile=${BENCH_FOLDER}/$1 --clients $chosenClients --host $host --port $port"
+  cd ${BENCH_FOLDER}/java
+}
+
 function runRustBenchmark(){
   rustConcurrentTasks=
   for value in $concurrentTasks
@@ -185,6 +203,36 @@ do
             runAllBenchmarks=0
             runNode=1
             ;;
+        -java)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Babushka"
+            ;;
+        -lettuce)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Lettuce"
+            ;;
+        -lettuce)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Jedis"
+            ;;
+        -java)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Babushka"
+            ;;
+        -lettuce)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Lettuce"
+            ;;
+        -lettuce)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Jedis"
+            ;;
         -csharp)
             runAllBenchmarks=0
             runCsharp=1
@@ -242,6 +290,13 @@ do
         runCSharpBenchmark $csharpResults $currentDataSize
     fi
 
+    if [ $runAllBenchmarks == 1 ] || [ $runJava == 1 ];
+    then
+        javaResults=$(resultFileName java $currentDataSize)
+        resultFiles+=$javaResults" "
+        runJavaBenchmark $javaResults $currentDataSize
+    fi
+
     if [ $runAllBenchmarks == 1 ] || [ $runRust == 1 ];
     then
         rustResults=$(resultFileName rust $currentDataSize)
@@ -250,8 +305,6 @@ do
     fi
 done
 
-
-
 flushDB
 
 if [ $writeResultsCSV == 1 ];

diff --git a/java/Cargo.toml b/java/Cargo.toml
@@ -1,4 +1,3 @@
-
 [package]
 name = "javababushka"
 version = "0.0.0"

diff --git a/java/README.md b/java/README.md
@@ -33,6 +33,7 @@ You can run benchmarks using `./gradlew run`. You can set arguments using the ar
 ```
 
 The following arguments are accepted: 
+* `configuration`: Release or Debug configuration
 * `resultsFile`: the results output file
 * `concurrentTasks`: Number of concurrent tasks
 * `clients`: one of: all|jedis|lettuce|babushka
@@ -46,4 +47,3 @@ The following arguments are accepted:
 * Connection Timeout: 
   * If you're unable to connect to redis, check that you are connecting to the correct host, port, and TLS configuration.
 * Only server-side certificates are supported by the TLS configured redis.
-
diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/AsyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/AsyncClient.java
@@ -0,0 +1,16 @@
+package javababushka.benchmarks;
+
+import java.util.concurrent.Future;
+
+public interface AsyncClient extends Client {
+
+  long DEFAULT_TIMEOUT = 1000;
+
+  Future<?> asyncSet(String key, String value);
+
+  Future<String> asyncGet(String key);
+
+  <T> T waitForResult(Future<T> future);
+
+  <T> T waitForResult(Future<T> future, long timeout);
+}