Merge remote-tracking branch 'origin/java_benchmarks' into java-clien…

…t-jni Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Oct 24, 2023 · 917dd0e · 917dd0e
2 parents 79459f5 + c3d235a
commit 917dd0e
Show file tree

Hide file tree

Showing 28 changed files with 691 additions and 1,153 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/benchmarks/utilities/csv_exporter.py b/benchmarks/utilities/csv_exporter.py
@@ -39,7 +39,7 @@
 
             json_file_name = os.path.basename(json_file_full_path)
 
-            languages = ["csharp", "node", "python", "rust"]
+            languages = ["csharp", "node", "python", "rust", "java"]
             language = next(
                 (language for language in languages if language in json_file_name), None
             )

diff --git a/java/.cargo/config.toml b/java/.cargo/config.toml
@@ -1,4 +1,3 @@
 [env]
 BABUSHKA_NAME = { value = "javababushka", force = true }
 BABUSHKA_VERSION = "0.1.0"
-
diff --git a/java/README.md b/java/README.md
@@ -30,7 +30,7 @@ You can run benchmarks using `./gradlew run`. You can set arguments using the ar
 
 ```shell
 ./gradlew run --args="-help"
-./gradlew run --args="-resultsFile=output.csv -dataSize \"100 1000\" -concurrentTasks \"10 100\" -clients all -host localhost -port 6279 -clientCount \"1 5\" -tls"
+./gradlew run --args="-resultsFile=output.json -dataSize \"100 1000\" -concurrentTasks \"10 100\" -clients all -host localhost -port 6279 -clientCount \"1 5\" -tls"
 ```
 
 The following arguments are accepted: 
@@ -47,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/build.gradle b/java/benchmarks/build.gradle
@@ -21,6 +21,10 @@ dependencies {
 
     // https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
     implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.24.3'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
+
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
 
 // Apply a specific Java toolchain to ease working on different environments.