[to remove] Java benchmarks: add Jedis and Lettuce clients (sync and async)

.github/workflows/java.yml

@@ -12,7 +12,7 @@ on:
       - babushka-core/**
       - submodules/**
       - "java/**"
-      - ".github/workflows/java.yml"  
+      - ".github/workflows/java.yml"
 
 # Run only most latest job on a branch and cancel previous ones
 concurrency:
@@ -41,12 +41,11 @@ jobs:
           distribution: "temurin"
           java-version: ${{ matrix.java }}
 
-      - name: Install and run protoc (protobuf)
+      - name: Install protoc (protobuf)
         run: |
           sudo apt update
           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

benchmarks/csharp/Program.cs

@@ -226,7 +226,7 @@ int num_of_concurrent_tasks
             {"num_of_tasks", num_of_concurrent_tasks},
             {"data_size", data_size},
             {"tps", tps},
-            {"clientCount", clients.Length},
+            {"client_count", clients.Length},
             {"is_cluster", "false"}
         };
         result = result

benchmarks/install_and_test.sh

@@ -24,13 +24,16 @@ 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"
+javaTlsFlag="-tls"
 
 function runPythonBenchmark(){
   # generate protobuf files
@@ -68,6 +71,12 @@ 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 -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"
+}
+
 function runRustBenchmark(){
   rustConcurrentTasks=
   for value in $concurrentTasks
@@ -109,7 +118,7 @@ function resultFileName() {
 
 function Help() {
     echo Running the script without any arguments runs all benchmarks.
-    echo Pass -node, -csharp, -python as arguments in order to run the node, csharp, or python benchmarks accordingly.
+    echo Pass -node, -csharp, -python, -java as arguments in order to run the node, csharp, python, or java benchmarks accordingly.
     echo Multiple such flags can be passed.
     echo Pass -no-csv to skip analysis of the results.
     echo
@@ -185,6 +194,21 @@ do
             runAllBenchmarks=0
             runNode=1
             ;;
+        -java)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Babushka"
+            ;;
+        -lettuce)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="lettuce_async"
+            ;;
+        -jedis)
+            runAllBenchmarks=0
+            runJava=1
+            chosenClients="Jedis"
+            ;;
         -csharp)
             runAllBenchmarks=0
             runCsharp=1
@@ -205,12 +229,15 @@ do
         -no-csv) writeResultsCSV=0 ;;
         -no-tls)
             tlsFlag=
+            javaTlsFlag=
             ;;
         -is-cluster)
             clusterFlag="--clusterModeEnabled"
+            javaClusterFlag="-clusterModeEnabled"
             ;;
         -port)
             portFlag="--port "$2
+            javaPortFlag="-port "$2
             shift
             ;;
     esac
@@ -242,6 +269,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 +284,6 @@ do
     fi
 done
 
-
-
 flushDB
 
 if [ $writeResultsCSV == 1 ];

benchmarks/node/node_benchmark.ts

@@ -167,7 +167,7 @@ async function run_clients(
         num_of_tasks: num_of_concurrent_tasks,
         data_size,
         tps,
-        clientCount: clients.length,
+        client_count: clients.length,
         is_cluster,
         ...set_latency_results,
         ...get_existing_latency_results,

benchmarks/python/python_benchmark.py

@@ -226,7 +226,7 @@ async def run_clients(
             "num_of_tasks": num_of_concurrent_tasks,
             "data_size": data_size,
             "tps": tps,
-            "clientCount": len(clients),
+            "client_count": len(clients),
             "is_cluster": is_cluster,
         },
         **get_existing_latency_results,

benchmarks/rust/src/main.rs

@@ -130,7 +130,7 @@ async fn perform_benchmark(args: Args) {
             Value::Number((number_of_operations as i64 * 1000 / stopwatch.elapsed_ms()).into()),
         );
         results_json.insert(
-            "clientCount".to_string(),
+            "client_count".to_string(),
             Value::Number(args.client_count.into()),
         );
         results_json.insert(

benchmarks/utilities/csv_exporter.py

@@ -1,3 +1,5 @@
+#!/bin/python3
+
 import csv
 import json
 import os
@@ -12,7 +14,7 @@
         "is_cluster",
         "num_of_tasks",
         "data_size",
-        "clientCount",
+        "client_count",
         "tps",
         "get_non_existing_p50_latency",
         "get_non_existing_p90_latency",
@@ -39,7 +41,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
             )

java/.cargo/config.toml

@@ -1,4 +1,3 @@
 [env]
 BABUSHKA_NAME = { value = "javababushka", force = true }
 BABUSHKA_VERSION = "0.1.0"
-

java/Cargo.toml

@@ -1,4 +1,3 @@
-
 [package]
 name = "javababushka"
 version = "0.0.0"
@@ -16,6 +15,8 @@ babushka = { path = "../babushka-core" }
 tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] }
 logger_core = {path = "../logger_core"}
 tracing-subscriber = "0.3.16"
+jni = "0.21.1"
+log = "0.4.20"
 
 [profile.release]
 lto = true

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: 
@@ -44,7 +44,6 @@ The following arguments are accepted:
 
 ### Troubleshooting
 
-* Connection Timeout: 
+* 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.
-

java/benchmarks/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     // Apply the application plugin to add support for building a CLI application in Java.
     id 'application'
+    id 'io.freefair.lombok'
 }
 
 repositories {
@@ -9,6 +10,8 @@ repositories {
 }
 
 dependencies {
+    implementation project(':client')
+
     // Use JUnit test framework.
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
 
@@ -18,6 +21,10 @@ dependencies {
     implementation 'io.lettuce:lettuce-core:6.2.6.RELEASE'
     implementation 'commons-cli:commons-cli:1.5.0'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
+    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.
@@ -30,12 +37,14 @@ java {
 application {
     // Define the main class for the application.
     mainClass = 'javababushka.benchmarks.BenchmarkingApp'
+    applicationDefaultJvmArgs += "-Djava.library.path=${projectDir}/../target/release:${projectDir}/../target/debug"
 }
 
-tasks.withType(Test) { 
-  testLogging {
-    exceptionFormat "full"
-    events "started", "skipped", "passed", "failed"
-    showStandardStreams true
-  }
+tasks.withType(Test) {
+    testLogging {
+        exceptionFormat "full"
+        events "started", "skipped", "passed", "failed"
+        showStandardStreams true
+    }
+    jvmArgs "-Djava.library.path=${projectDir}/../target/release:${projectDir}/../target/debug"
 }