Java client jni netty

.github/workflows/java.yml

@@ -1,4 +1,4 @@
-name: SQL Java CI
+name: Java CI
 
 on:
   pull_request:

.github/workflows/python.yml

@@ -51,7 +51,7 @@ jobs:
               working-directory: ./python
               run: |
                   python -m pip install --upgrade pip
-                  pip install flake8 isort black mypy-protobuf
+                  pip install flake8 isort black mypy-protobuf deadcode
 
             - name: Lint with isort
               working-directory: ./python
@@ -71,6 +71,11 @@ jobs:
               run: |
                   black --target-version py36 --check --diff .
 
+            - name: Lint with deadcode
+              working-directory: .
+              run: |
+                  deadcode . --ignore-definitions=InfoSection,Level,*protobuf*,*pytest*
+
             - name: Start redis server
               working-directory: ./python
               run: redis-server &

babushka-core/src/protobuf/redis_request.proto

@@ -73,6 +73,11 @@ enum RequestType {
     Decr=35;
     IncrByFloat=36;
     DecrBy=37;
+    HashGetAll=38;
+    HashMSet=39;
+    HashMGet=40;
+    HashIncrBy = 41;
+    HashIncrByFloat = 42;
 }
 
 message Command {

babushka-core/src/socket_listener.rs

@@ -308,6 +308,11 @@ fn get_command(request: &Command) -> Option<Cmd> {
         RequestType::IncrByFloat => Some(cmd("INCRBYFLOAT")),
         RequestType::Decr => Some(cmd("DECR")),
         RequestType::DecrBy => Some(cmd("DECRBY")),
+        RequestType::HashGetAll => Some(cmd("HGETALL")),
+        RequestType::HashMSet => Some(cmd("HMSET")),
+        RequestType::HashMGet => Some(cmd("HMGET")),
+        RequestType::HashIncrBy => Some(cmd("HINCRBY")),
+        RequestType::HashIncrByFloat => Some(cmd("HINCRBYFLOAT")),
     }
 }
 

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",
@@ -51,5 +53,5 @@
                 values = [json_object[field] for field in base_fields]
                 writer.writerow(values)
 
-for json_file_full_path in sys.argv[1:-1]:
-    os.remove(json_file_full_path)
+# for json_file_full_path in sys.argv[1:-1]:
+#     os.remove(json_file_full_path)

benchmarks/utilities/fill_db.ts

@@ -20,7 +20,7 @@ async function fill_database(
     const sets = Array.from(Array(CONCURRENT_SETS).keys()).map(
         async (index) => {
             for (let i = 0; i < SIZE_SET_KEYSPACE / CONCURRENT_SETS; ++i) {
-                const key = (index * CONCURRENT_SETS + index).toString();
+                const key = (i * CONCURRENT_SETS + index).toString();
                 await client.set(key, data);
             }
         }

examples/python/client_example.py

@@ -73,9 +73,9 @@ async def test_cluster_client(host: str = "localhost", port: int = 6379):
 
 async def main():
     set_console_logger(LogLevel.DEBUG)
-    # set_file_logger(LogLevel.DEBUG)
+    set_file_logger(LogLevel.DEBUG)
     await test_standalone_client()
-    # await test_cluster_client()
+    await test_cluster_client()
 
 
 if __name__ == "__main__":

java/.cargo/config.toml

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

java/Cargo.toml

@@ -15,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

@@ -8,9 +8,9 @@ language api to enhance performance and limit cpu cycles at scale.
 
 The Java client (javababushka) contains the following parts:
 
-1. A Java client (lib folder): wrapper to rust-client
-2. An examples script: to sanity test javababushka and similar java-clients against a redis host
-3. A benchmark app: to performance benchmark test javababushka and similar java-clients against a redis host
+1. A Java client (lib folder): wrapper to rust-client.
+2. An examples script: to sanity test javababushka and similar java-clients against a redis host.
+3. A benchmark app: to performance benchmark test javababushka and similar java-clients against a redis host.
 
 ## Building
 
@@ -29,20 +29,21 @@ These IDE plugins can auto-format code on file save or by single click:
 You can run benchmarks using `./gradlew run`. You can set arguments using the args flag like:
 
 ```shell
-./gradlew run --args="--clients lettuce"
+./gradlew run --args="-help"
+./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: 
-* `configuration`: Release or Debug configuration
 * `resultsFile`: the results output file
-* `concurrentTasks`: Number of concurrent tasks 
+* `concurrentTasks`: Number of concurrent tasks
 * `clients`: one of: all|jedis|lettuce|babushka
 * `clientCount`: Client count
-* `host`: redis server host url 
+* `host`: redis server host url
 * `port`: redis server port number
 * `tls`: redis TLS configured
 
 ### Troubleshooting
 
-* If you're unable to connect to redis (such as timeout), check your port or the TLS flag
-* Only server-side certificates are supported by the TLS configured redis
+* 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 {
@@ -18,10 +19,25 @@ 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'
+
+    // 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'
 
+    implementation group: 'io.netty', name: 'netty-handler', version: '4.1.100.Final'
+    // https://github.com/netty/netty/wiki/Native-transports
+    // Windows is not supported, because babushka does not support windows, because tokio does not support windows, because ... 42
+    implementation group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.100.Final', classifier: 'linux-x86_64'
+    implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.100.Final', classifier: 'osx-x86_64'
+    implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.100.Final', classifier: 'osx-aarch_64'
+
+    //testImplementation group: 'org.slf4j', name: 'slf4j-reload4j', version: '2.0.9'
+    //testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.9'
+
     compileOnly 'org.projectlombok:lombok:1.18.30'
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    testCompileOnly 'org.projectlombok:lombok:1.18.30'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
 
 // Apply a specific Java toolchain to ease working on different environments.
@@ -34,12 +50,15 @@ java {
 application {
     // Define the main class for the application.
     mainClass = 'javababushka.benchmarks.BenchmarkingApp'
+    mainClass = 'javababushka.benchmarks.clients.babushka.JniNettyClient'
+    applicationDefaultJvmArgs += "-Djava.library.path=${projectDir}/../target/debug"
 }
 
 tasks.withType(Test) { 
-  testLogging {
-    exceptionFormat "full"
-    events "started", "skipped", "passed", "failed"
-    showStandardStreams true
-  }
+    testLogging {
+        exceptionFormat "full"
+        events "started", "skipped", "passed", "failed"
+        showStandardStreams true
+    }
+    jvmArgs "-Djava.library.path=${projectDir}/../target/debug"
 }