Combine java pipeline and java benchmarks (#8)

* Merge Pull Request #5 - Add java pipeline.

Also changed:
* Merged two projects.
* Updated CI.
* Fixed tests and updated `junit` version.
* Spotless.
* Add new gradle tasks.

Signed-off-by: Yury-Fridlyand <[email protected]>

.github/workflows/java-benchmark.yml

@@ -0,0 +1,46 @@
+name: Java client benchmarks
+
+on:
+ workflow_dispatch:
+ inputs:
+ name:
+ required: false
+ type: string
+
+run-name: ${{ inputs.name == '' && format('{0} @ {1}', github.ref_name, github.sha) || inputs.name }}
+
+jobs:
+ java-benchmark:
+ strategy:
+ matrix:
+ java:
+ - 11
+ - 17
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: recursive
+
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
+ with:
+ distribution: "temurin"
+ java-version: ${{ matrix.java }}
+
+ - name: Start Redis
+ run: docker run -p 6379:6379 -p 8001:8001 -d redis/redis-stack
+
+ - name: Run benchmarks
+ working-directory: java/jabushka
+ run: ./gradlew :benchmark:run
+
+ - name: Upload test reports
+ if: always()
+ continue-on-error: true
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-reports-${{ matrix.java }}
+ path: |
+ java/jabushka/benchmarks/build/reports/**

.github/workflows/java.yml

@@ -0,0 +1,63 @@
+name: SQL Java CI
+
+on:
+ pull_request:
+ push:
+ paths:
+ - "java/**"
+ - ".github/workflows/java.yml"
+
+# Run only most latest job on a branch and cancel previous ones
+concurrency:
+ group: ${{ github.head_ref || github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ build-and-test-java-client:
+ strategy:
+ # Run all jobs
+ fail-fast: false
+ matrix:
+ java:
+ - 11
+ - 17
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: recursive
+
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
+ with:
+ distribution: "temurin"
+ java-version: ${{ matrix.java }}
+
+ - name: Install and run protoc (protobuf)
+ run: |
+ sudo apt update
+ sudo apt install -y protobuf-compiler
+ mkdir -p java/jabushka/jabushka/src/main/java/org/babushka/jabushka/generated
+ protoc -Iprotobuf=babushka-core/src/protobuf/ --java_out=java/jabushka/jabushka/src/main/java/org/babushka/jabushka/generated babushka-core/src/protobuf/*.proto
+
+ - name: Build rust part
+ working-directory: java
+ run: cargo build
+
+ - name: Start Redis
+ run: docker run -p 6379:6379 -p 8001:8001 -d redis/redis-stack
+
+ - name: Build java part
+ working-directory: java/jabushka
+ run: ./gradlew --continue build
+
+ - name: Upload test reports
+ if: always()
+ continue-on-error: true
+ uses: actions/upload-artifact@v3
+ with:
+ name: test-reports-${{ matrix.java }}
+ path: |
+ java/jabushka/jabushka/build/reports/**
+ java/jabushka/integTest/build/reports/**

.gitignore

@@ -4,6 +4,9 @@
 debug/
 target/
 
+# Git stuff
+.worktrees
+
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock
@@ -17,6 +20,14 @@ dump.rdb
 .env
 benchmarks/results
 
+# IDE generaged files
+.vs
+.vscode
+.idea
+
+# MacOS metadata
+.DS_Store
+
 # lock files
 
 yarn.lock

java/.cargo/config.toml

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

java/.gitignore

@@ -3,3 +3,6 @@
 
 # Ignore Gradle build output directory
 build
+
+# Ignore generated files (e.g. protobuf)
+generated

java/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "jabushka"
+version = "0.0.0"
+edition = "2021"
+license = "BSD-3-Clause"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "jabushka"
+crate-type = ["cdylib"]
+
+[dependencies]
+redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] }
+babushka = { path = "../babushka-core" }
+tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] }
+logger_core = {path = "../logger_core"}
+tracing-subscriber = "0.3.16"
+
+[profile.release]
+lto = true
+debug = true

java/README.md

@@ -1,7 +1,7 @@
 # Summary - Java Wrapper
 
-This module contains a Java-client wrapper that connects to the `Babushka`-rust-client.  The rust client connects to 
-redis, while this wrapper provides Java-language binding.  The objective of this wrapper is to provide a thin-wrapper
+This module contains a Java-client wrapper that connects to the `Babushka`-rust-client. The rust client connects to
+redis, while this wrapper provides Java-language binding. The objective of this wrapper is to provide a thin-wrapper
 language api to enhance performance and limit cpu cycles at scale. 
 
 ## Organization
@@ -16,9 +16,17 @@ The Java client (javabushka) contains the following parts:
 
 You can assemble the Java clients benchmarks by compiling using `./gradlew build`. 
 
+## Code style
+
+Code style is enforced by spotless with Google Java Format. The build fails if code formatted incorrectly, but you can auto-format code with `./gradlew spotlessApply`.
+Run this command before every commit to keep code in the same style.
+These IDE plugins can auto-format code on file save or by single click:
+* [For Intellij IDEA](https://plugins.jetbrains.com/plugin/18321-spotless-gradle)
+* [For VS Code](https://marketplace.visualstudio.com/items?itemName=richardwillis.vscode-spotless-gradle)
+
 ## Benchmarks
 
-You can run benchmarks using `./gradlew run`.  You can set arguments using the args flag like: 
+You can run benchmarks using `./gradlew run`. You can set arguments using the args flag like:
 
 ```shell
 ./gradlew run --args="--clients lettuce"