diff --git a/benchmarks/install_and_test.sh b/benchmarks/install_and_test.sh index 8c9a1ca67a..ee1cedbb51 100755 --- a/benchmarks/install_and_test.sh +++ b/benchmarks/install_and_test.sh @@ -26,9 +26,9 @@ runNode=0 runCsharp=0 runJava=0 runRust=0 -concurrentTasks="1 10 100 1000" -dataSize="100 4000" -clientCount="1" +concurrentTasks="10 100 1000" +dataSize="100" +clientCount="2" chosenClients="all" host="localhost" port=6379 @@ -71,18 +71,20 @@ function runCSharpBenchmark(){ } function runJavaBenchmark(){ + cd ${BENCH_FOLDER}/../kotlin + ./gradlew build 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 + cargo build + # ./gradlew build + # echo ./gradlew :benchmarks:run --args="-resultsFile ${BENCH_FOLDER}/$1 -dataSize \"$2\" -concurrentTasks \"$concurrentTasks\" -clients \"$chosenClients\" -host $host -port $port -clientCount \"$clientCount\" $tlsFlag" + ./gradlew :benchmarks:run --args="-resultsFile ${BENCH_FOLDER}/$1 -dataSize \"$2\" -concurrentTasks \"$concurrentTasks\" -clients \"$chosenClients\" -host $host -port $port -clientCount \"$clientCount\" $tlsFlag" } function runRustBenchmark(){ rustConcurrentTasks= for value in $concurrentTasks do - rustConcurrentTasks=$rustConcurrentTasks" --concurrentTasks "$value + rustConcurrentTasks="$rustConcurrentTasks --concurrentTasks $value" done cd ${BENCH_FOLDER}/rust cargo run --release -- --resultsFile=../$1 --dataSize $2 $rustConcurrentTasks --host $host --clientCount $clientCount $tlsFlag $clusterFlag $portFlag @@ -198,7 +200,7 @@ do -java) runAllBenchmarks=0 runJava=1 - chosenClients="Babushka" + chosenClients="Lettuce,JNI_FFI,JNA_FFI,Kotlin" ;; -lettuce) runAllBenchmarks=0 diff --git a/benchmarks/utilities/csv_exporter.py b/benchmarks/utilities/csv_exporter.py index 3d48adfe17..292b86d13c 100644 --- a/benchmarks/utilities/csv_exporter.py +++ b/benchmarks/utilities/csv_exporter.py @@ -50,6 +50,3 @@ json_object["language"] = language 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) diff --git a/java/.gitignore b/java/.gitignore index 8f60484e5a..cedb8f35b3 100644 --- a/java/.gitignore +++ b/java/.gitignore @@ -1,8 +1,16 @@ # Ignore Gradle project-specific cache directory .gradle +# Ignore gradle wrapper files (they are managed by gradle) +gradlew +gradlew.bat +gradle + # Ignore Gradle build output directory build +# IDE files +.idea + # Ignore generated files (e.g. protobuf) generated diff --git a/java/Cargo.toml b/java/Cargo.toml index 01ecb23e4c..d002bf9abe 100644 --- a/java/Cargo.toml +++ b/java/Cargo.toml @@ -13,9 +13,18 @@ crate-type = ["cdylib"] 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"} +logger_core = { path = "../logger_core" } tracing-subscriber = "0.3.16" +jni = "0.21.1" +env_logger = "0.10.0" +log = "0.4.20" +thiserror = "1.0.49" +num-derive = "0.4.1" +num-traits = "0.2.17" [profile.release] lto = true debug = true + +[build-dependencies] +cbindgen = "0.26.0" diff --git a/java/benchmarks/build.gradle b/java/benchmarks/build.gradle index 5e22fda5c7..b47b58c224 100644 --- a/java/benchmarks/build.gradle +++ b/java/benchmarks/build.gradle @@ -22,6 +22,11 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.30' annotationProcessor 'org.projectlombok:lombok:1.18.30' + + // Required for interop + implementation "net.java.dev.jna:jna:5.8.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20" + implementation files("../../kotlin/client/build/libs/kotlinbabushka-0.0.1.jar") } // Apply a specific Java toolchain to ease working on different environments. @@ -34,6 +39,8 @@ java { application { // Define the main class for the application. mainClass = 'javababushka.benchmarks.BenchmarkingApp' + // mainClass = 'javababushka.benchmarks.babushka.Jni' + applicationDefaultJvmArgs += "-Djava.library.path=${projectDir}/../target/debug" } tasks.withType(Test) { diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java index 1e3c9ac0e0..bfaa63f8ec 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java @@ -5,6 +5,9 @@ import java.util.Arrays; import java.util.Optional; import java.util.stream.Stream; +import javababushka.benchmarks.babushka.JnaFfi; +import javababushka.benchmarks.babushka.JniFfi; +import javababushka.benchmarks.babushka.KotlinClient; import javababushka.benchmarks.jedis.JedisClient; import javababushka.benchmarks.jedis.JedisPseudoAsyncClient; import javababushka.benchmarks.lettuce.LettuceAsyncClient; @@ -46,6 +49,9 @@ public static void main(String[] args) { for (ClientName client : runConfiguration.clients) { switch (client) { + case JNI_FFI: + testClientSetGet(JniFfi::new, runConfiguration, false); + break; case JEDIS: testClientSetGet(JedisClient::new, runConfiguration, false); break; @@ -58,6 +64,12 @@ public static void main(String[] args) { case LETTUCE_ASYNC: testClientSetGet(LettuceAsyncClient::new, runConfiguration, true); break; + case JNA_FFI: + testClientSetGet(JnaFfi::new, runConfiguration, false); + break; + case KOTLIN: + testClientSetGet(KotlinClient::new, runConfiguration, false); + break; case BABUSHKA: System.out.println("Babushka not yet configured"); break; @@ -137,7 +149,9 @@ private static RunConfiguration verifyOptions(CommandLine line) throws ParseExce return Stream.of( ClientName.JEDIS, ClientName.JEDIS_ASYNC, - ClientName.BABUSHKA, + ClientName.JNA_FFI, + ClientName.JNI_FFI, + ClientName.KOTLIN, // ClientName.BABUSHKA_ASYNC, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC); @@ -149,8 +163,9 @@ private static RunConfiguration verifyOptions(CommandLine line) throws ParseExce case ALL_SYNC: return Stream.of( ClientName.JEDIS, - // ClientName.BABUSHKA, - ClientName.LETTUCE); + ClientName.JNA_FFI, + ClientName.LETTUCE, + ClientName.JNI_FFI); default: return Stream.of(e); } @@ -183,7 +198,7 @@ private static int[] parseIntListOption(String line) throws ParseException { lineValue = lineValue.substring(1, lineValue.length() - 1); } // check if it's the correct format - if (!lineValue.matches("\\d+(\\s+\\d+)?")) { + if (!lineValue.matches("\\d+(\\s+\\d+)*")) { throw new ParseException("Invalid option: " + line); } // split the string into a list of integers @@ -195,8 +210,11 @@ public enum ClientName { JEDIS_ASYNC("Jedis async"), LETTUCE("Lettuce"), LETTUCE_ASYNC("Lettuce async"), - BABUSHKA("Babushka"), + JNA_FFI("JNA FFI"), BABUSHKA_ASYNC("Babushka async"), + JNI_FFI("JNI FFI"), + BABUSHKA("Babushka"), + KOTLIN("Kotlin"), ALL("All"), ALL_SYNC("All sync"), ALL_ASYNC("All async"); @@ -232,12 +250,11 @@ public static class RunConfiguration { public RunConfiguration() { configuration = "Release"; resultsFile = Optional.empty(); - dataSize = new int[] {100, 4000}; - concurrentTasks = new int[] {100, 1000}; + dataSize = new int[] {20}; + concurrentTasks = new int[] {10, 100}; clients = new ClientName[] { - // ClientName.BABUSHKA_ASYNC, - ClientName.JEDIS, ClientName.JEDIS_ASYNC, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC + ClientName.LETTUCE, ClientName.JNI_FFI, ClientName.JNA_FFI, ClientName.KOTLIN }; host = "localhost"; port = 6379; diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java new file mode 100644 index 0000000000..68d1544f09 --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java @@ -0,0 +1,153 @@ +package javababushka.benchmarks.babushka; + +import com.sun.jna.Library; +import com.sun.jna.Native; +import com.sun.jna.Structure; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import javababushka.benchmarks.SyncClient; +import javababushka.benchmarks.utils.ConnectionSettings; + +public class JnaFfi implements SyncClient { + + private final long ptr = lib.init_client0(42); + + // = enum + public static enum ResultType { + Str(0), + Int(1), + Nil(2), + Data(3), + Bulk(4), + Ok(5), + Err(6), + Undef(-1); + + private int id; + + ResultType(int id) { + this.id = id; + } + + public static ResultType of(int val) { + switch (val) { + case 0: + return ResultType.Str; + case 1: + return ResultType.Int; + case 2: + return ResultType.Nil; + case 3: + return ResultType.Data; + case 4: + return ResultType.Bulk; + case 5: + return ResultType.Ok; + case 6: + return ResultType.Err; + default: + return ResultType.Undef; + } + } + } + + public interface RustLib extends Library { + + @Structure.FieldOrder({"error", "value_type", "string", "num"}) + public static class BabushkaResult extends Structure { + public BabushkaResult() { + error = null; + value_type = 0; + string = null; + num = 0; + } + + public static class ByValue extends BabushkaResult implements Structure.ByValue {} + + public String error = null; + public int value_type = 0; + public String string = null; + public long num = 0; + } + ; + + public long init_client0(int data); + + public BabushkaResult.ByValue connect0(long client, String address); + + public BabushkaResult.ByValue set0(long client, String key, String value); + + public BabushkaResult.ByValue get0(long client, String key); + } + + private static final RustLib lib; + + static { + var is_win = System.getProperty("os.name").contains("Windows"); + var targetDir = + Paths.get( + "jna-stuff", "build", "resources", "main", is_win ? "win32-x86-64" : "linux-x86-64") + .toAbsolutePath(); + + // System.setProperty("jna.debug_load", "true"); + System.setProperty("jna.library.path", targetDir.toString()); + + var created = targetDir.toFile().mkdirs(); + try { + if (is_win) { + Files.copy( + Paths.get(System.getProperty("user.dir"), "target", "debug", "javababushka.dll"), + Paths.get(targetDir.toString(), "javababushka.dll"), + StandardCopyOption.REPLACE_EXISTING); + } else { + Files.copy( + Paths.get( + System.getProperty("user.dir"), "..", "target", "debug", "libjavababushka.so"), + Paths.get(targetDir.toString(), "libjavababushka.so"), + StandardCopyOption.REPLACE_EXISTING); + } + } catch (IOException e) { + System.out.printf("Failed to copy lib: %s%n", e.getMessage()); + e.printStackTrace(); + } + + lib = Native.load("javababushka", RustLib.class); + } + + @Override + public void connectToRedis() { + connectToRedis(new ConnectionSettings("localhost", 6379, false)); + } + + @Override + public void connectToRedis(ConnectionSettings connectionSettings) { + var connStr = + String.format( + "%s://%s:%d", + connectionSettings.useSsl ? "rediss" : "redis", + connectionSettings.host, + connectionSettings.port); + lib.connect0(ptr, connStr); + } + + @Override + public String getName() { + return "JNA babushka"; + } + + @Override + public void set(String key, String value) { + var res = lib.set0(ptr, key, value); + } + + @Override + public String get(String key) { + var res = lib.get0(ptr, key); + if (res.value_type == ResultType.Str.id) { + return res.string; + } + return res.error; + } +} diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java new file mode 100644 index 0000000000..017b2d8d9d --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java @@ -0,0 +1,132 @@ +package javababushka.benchmarks.babushka; + +import java.nio.file.Paths; +import lombok.Builder; + +public class Jni { + static { + System.setProperty( + "java.library.path", + Paths.get(System.getProperty("user.dir"), "target", "debug").toString()); + System.loadLibrary("javababushka"); + } + + public static native long init_client(int a); + + public static native BabushkaResult test(long ptr, String address); + + public static native BabushkaResult connect(long ptr, String address); + + public static native BabushkaResult set(long ptr, String name, String value); + + public static native BabushkaResult get(long ptr, String name); + + public static native BabushkaResult from_str(String str); + + public static native BabushkaResult from_number(long num); + + public static native BabushkaResult from_ok(); + + public static native BabushkaResult nnew(String str, int resultType, String string, long number); + + public static enum ResultType { + STR, // * const c_char + NUM, // i64 + NIL, + DATA, // Vec + BULK, // Vec + OK, + ERR; + + public static ResultType of(int ordinal) { + switch (ordinal) { + case 0: + return STR; + case 1: + return NUM; + case 2: + return NIL; + case 3: + return DATA; + case 4: + return BULK; + case 5: + return OK; + default: + return ERR; + } + } + } + + @Builder + public static class BabushkaResult { + public String error = null; + public ResultType resultType; + public String string = null; + public long number = 0; + + public BabushkaResult(String error, ResultType resultType, String string, long number) { + this.error = error; + this.resultType = resultType; + this.string = string; + this.number = number; + } + + public BabushkaResult(String error, int resultType, String string, long number) { + this(error, ResultType.of(resultType), string, number); + } + + // private BabushkaResult(){} + + public static BabushkaResult from_str(String str) { + return BabushkaResult.builder().string(str).resultType(ResultType.STR).build(); + } + + public static BabushkaResult from_empty_str() { + return BabushkaResult.builder().resultType(ResultType.STR).build(); + } + + public static BabushkaResult from_number(long num) { + return BabushkaResult.builder().number(num).resultType(ResultType.NUM).build(); + } + + public static BabushkaResult from_error(String err) { + return BabushkaResult.builder().error(err).resultType(ResultType.ERR).build(); + } + + public static BabushkaResult from_ok() { + return BabushkaResult.builder().resultType(ResultType.OK).build(); + } + + public static BabushkaResult from_nil() { + return BabushkaResult.builder().resultType(ResultType.NIL).build(); + } + } + + public static void main(String[] args) { + var t = BabushkaResult.from_empty_str(); + + var ptr = init_client(42); + var a = test(ptr, "12334"); + System.out.printf("Test1: %s%n", a.string); + var b = test(ptr, "abadfgdg"); + System.out.printf("Test2: %s%n", b.string); + + var c = connect(ptr, "redis://localhost:6379"); + System.out.printf("Connect: str = %s, err = %s, type = %s%n", c.string, c.error, c.resultType); + + var set = set(ptr, "JNI value", "JJJ"); + System.out.printf( + "Set: str = %s, err = %s, type = %s%n", set.string, set.error, set.resultType); + + var get1 = get(ptr, "JNI value"); + System.out.printf( + "Get1: str = %s, err = %s, type = %s%n", get1.string, get1.error, get1.resultType); + + var get2 = get(ptr, "JJJ"); + System.out.printf( + "Get2: str = %s, err = %s, type = %s%n", get2.string, get2.error, get2.resultType); + + int d = 5; + } +} diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java new file mode 100644 index 0000000000..05448e279b --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java @@ -0,0 +1,41 @@ +package javababushka.benchmarks.babushka; + +import javababushka.benchmarks.SyncClient; +import javababushka.benchmarks.utils.ConnectionSettings; + +public class JniFfi implements SyncClient { + + private long ptr = 0; + + @Override + public void connectToRedis() { + connectToRedis(new ConnectionSettings("localhost", 6379, false)); + } + + @Override + public void connectToRedis(ConnectionSettings connectionSettings) { + ptr = Jni.init_client(0); + Jni.connect( + ptr, + String.format( + "%s://%s:%d", + connectionSettings.useSsl ? "rediss" : "redis", + connectionSettings.host, + connectionSettings.port)); + } + + @Override + public String getName() { + return "JNI FFI Sync client"; + } + + @Override + public void set(String key, String value) { + Jni.set(ptr, key, value); + } + + @Override + public String get(String key) { + return Jni.get(ptr, key).string; + } +} diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java new file mode 100644 index 0000000000..54dae871d8 --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java @@ -0,0 +1,60 @@ +package javababushka.benchmarks.babushka; + +import babushka.BabushkaClient; +import babushka.BabushkaClientData; +import babushka.BabushkaRedisException; +import javababushka.benchmarks.SyncClient; +import javababushka.benchmarks.utils.ConnectionSettings; + +public class KotlinClient implements SyncClient { + + private BabushkaClient client = new BabushkaClient(); + private BabushkaClientData data = null; + + @Override + public void connectToRedis() { + connectToRedis(new ConnectionSettings("localhost", 6379, false)); + } + + @Override + public void connectToRedis(ConnectionSettings connectionSettings) { + try { + data = + client.connect( + String.format( + "%s://%s:%d", + connectionSettings.useSsl ? "rediss" : "redis", + connectionSettings.host, + connectionSettings.port)); + } catch (BabushkaRedisException e) { + System.out.printf("Failed to connect: %s%n", e.getMessage()); + e.printStackTrace(); + } + } + + @Override + public String getName() { + return "kotlin"; + } + + @Override + public void set(String key, String value) { + try { + client.set(data, key, value); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get3: %s%n", e.getMessage()); + e.printStackTrace(); + } + } + + @Override + public String get(String key) { + try { + return client.get(data, key); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get3: %s%n", e.getMessage()); + e.printStackTrace(); + } + return null; + } +} diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java index d3d7baadb1..d7abbd1d45 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java @@ -90,32 +90,37 @@ public static Map calculateResults( ArrayList latencies = entry.getValue(); double avgLatency = - SECONDS_IN_NANO * latencies.stream().mapToLong(Long::longValue).sum() / latencies.size(); + latencies.stream().mapToLong(Long::longValue).sum() * 1e-6 / latencies.size(); Collections.sort(latencies); results.put( action, new LatencyResults( avgLatency, - SECONDS_IN_NANO * percentile(latencies, 50), - SECONDS_IN_NANO * percentile(latencies, 90), - SECONDS_IN_NANO * percentile(latencies, 99), - SECONDS_IN_NANO * stdDeviation(latencies, avgLatency))); + percentile(latencies, 50) * 1e-6, + percentile(latencies, 90) * 1e-6, + percentile(latencies, 99) * 1e-6, + stdDeviation(latencies, avgLatency) * 1e-6)); } return results; } - public static void printResults(Map resultsMap) { + public static void printResults( + Map resultsMap, double duration, int iterations) { + System.out.printf("Runtime s: %f%n", duration); + System.out.printf("Iterations: %d%n", iterations); + System.out.printf("TPS: %f%n", iterations / duration); for (Map.Entry entry : resultsMap.entrySet()) { ChosenAction action = entry.getKey(); LatencyResults results = entry.getValue(); - System.out.println("Avg. time in ms per " + action + ": " + results.avgLatency / 1000000.0); - System.out.println(action + " p50 latency in ms: " + results.p50Latency / 1000000.0); - System.out.println(action + " p90 latency in ms: " + results.p90Latency / 1000000.0); - System.out.println(action + " p99 latency in ms: " + results.p99Latency / 1000000.0); - System.out.println(action + " std dev in ms: " + results.stdDeviation / 1000000.0); + System.out.printf("===> %s <===%n", action); + System.out.printf("avg. time ms: %f%n", results.avgLatency); + System.out.printf("std dev ms: %f%n", results.stdDeviation); + System.out.printf("p50 latency ms: %f%n", results.p50Latency); + System.out.printf("p90 latency ms: %f%n", results.p90Latency); + System.out.printf("p99 latency ms: %f%n", results.p99Latency); } } @@ -189,6 +194,7 @@ public static void testClientSetGet( e.printStackTrace(); } }); + long ended = System.nanoTime(); var calculatedResults = calculateResults(actionResults); if (config.resultsFile.isPresent()) { @@ -199,9 +205,9 @@ public static void testClientSetGet( clientCreator.get().getName(), clientCount, concurrentNum, - iterationCounter.get() * 1e9 / (System.nanoTime() - started)); + iterationCounter.get() * 1e9 / (ended - started)); } - printResults(calculatedResults); + printResults(calculatedResults, (ended - started) / 1e9, iterationCounter.get()); } } } diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java index 064148de51..0304eecbd5 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java @@ -38,7 +38,7 @@ public static void Write( // TODO: is_cluster .data_size(dataSize) .client(client) - .client_count(clientCount) + .clientCount(clientCount) .num_of_tasks(numOfTasks) .tps(tps) .get_existing_average_latency( @@ -79,7 +79,7 @@ public static void Write( @Builder public static class Measurements { private String client; - private int client_count; + private int clientCount; private int data_size; private double get_existing_average_latency; private double get_existing_p50_latency; diff --git a/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java b/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java index 12f800260f..2b3e9bb659 100644 --- a/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java +++ b/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java @@ -66,6 +66,6 @@ public void testResourceSetGet() { latencies.get(latency.getKey()).add(latency.getValue()); } - Benchmarking.printResults(Benchmarking.calculateResults(latencies)); + Benchmarking.printResults(Benchmarking.calculateResults(latencies), 0, iterations); } } diff --git a/java/build.gradle b/java/build.gradle index 340f2c98cb..5e612c0b51 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'application' id 'java-library' id 'io.freefair.lombok' version '6.4.0' id 'jacoco' diff --git a/java/build.rs b/java/build.rs new file mode 100644 index 0000000000..6613129e4b --- /dev/null +++ b/java/build.rs @@ -0,0 +1,17 @@ +extern crate cbindgen; + +use std::env; +use cbindgen::Language; + +fn main() { + let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); + + cbindgen::Builder::new() + .with_crate(crate_dir) + .with_language(Language::Cxx) + //.with_cpp_compat(true) + .generate() + .expect("Unable to generate bindings") + //.write_to_file("bindings.h"); + .write_to_file(format!("{}.hpp", env::var("CARGO_PKG_NAME").unwrap())); +} diff --git a/java/javababushka.hpp b/java/javababushka.hpp new file mode 100644 index 0000000000..f6a62857c5 --- /dev/null +++ b/java/javababushka.hpp @@ -0,0 +1,47 @@ +#include +#include +#include +#include +#include + +struct BabushkaResultStr { + const char *error; + const char *result; +}; + +struct BabushkaResult { + const char *error; + uint32_t value_type; + const char *str; + int64_t num; +}; + +extern "C" { + +BabushkaResultStr static_function_which_throws(); + +BabushkaResultStr static_function4(); + +BabushkaResult static_function2_0(); + +BabushkaResult static_function2_1(); + +BabushkaResult static_function2_2(); + +BabushkaResult static_function2_3(); + +BabushkaResult static_function2_4(); + +void rust_ctor(); + +uint64_t init_client0(int32_t data); + +BabushkaResult test0(uint64_t ptr, const char *address); + +BabushkaResult connect0(uint64_t ptr, const char *address); + +BabushkaResult set0(uint64_t ptr, const char *key, const char *value); + +BabushkaResult get0(uint64_t ptr, const char *key); + +} // extern "C" diff --git a/java/javababushka_benchmarks_babushka_Jni.h b/java/javababushka_benchmarks_babushka_Jni.h new file mode 100644 index 0000000000..3f0fcd5bd9 --- /dev/null +++ b/java/javababushka_benchmarks_babushka_Jni.h @@ -0,0 +1,85 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class javababushka_benchmarks_babushka_Jni */ + +#ifndef _Included_javababushka_benchmarks_babushka_Jni +#define _Included_javababushka_benchmarks_babushka_Jni +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: init_client + * Signature: (I)J + */ +JNIEXPORT jlong JNICALL Java_javababushka_benchmarks_babushka_Jni_init_1client + (JNIEnv *, jclass, jint); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: test + * Signature: (JLjava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_test + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: connect + * Signature: (JLjava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_connect + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: set + * Signature: (JLjava/lang/String;Ljava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_set + (JNIEnv *, jclass, jlong, jstring, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: get + * Signature: (JLjava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_get + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: from_str + * Signature: (Ljava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_from_1str + (JNIEnv *, jclass, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: from_number + * Signature: (J)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_from_1number + (JNIEnv *, jclass, jlong); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: from_ok + * Signature: ()Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_from_1ok + (JNIEnv *, jclass); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: nnew + * Signature: (Ljava/lang/String;ILjava/lang/String;J)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_nnew + (JNIEnv *, jclass, jstring, jint, jstring, jlong); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/java/jna-stuff/build.gradle b/java/jna-stuff/build.gradle new file mode 100644 index 0000000000..941771480f --- /dev/null +++ b/java/jna-stuff/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'java' + id 'application' +} + +group = 'org.example' +version = '1.13.0' + +repositories { + mavenCentral() +} + +dependencies { + // Required for interop + implementation "net.java.dev.jna:jna:5.8.0" +} + +test { + useJUnitPlatform() +} + +application { + mainClass = 'Loader' +} diff --git a/java/jna-stuff/src/main/java/Loader.java b/java/jna-stuff/src/main/java/Loader.java new file mode 100644 index 0000000000..66af26b412 --- /dev/null +++ b/java/jna-stuff/src/main/java/Loader.java @@ -0,0 +1,196 @@ +import com.sun.jna.Library; +import com.sun.jna.Native; +import com.sun.jna.Structure; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +public class Loader { + // = enum + public static enum ResultType { + Str(0), + Int(1), + Nil(2), + Data(3), + Bulk(4), + Ok(5), + Err(6), + Undef(-1); + + private int id; + + ResultType(int id) { + this.id = id; + } + + public static ResultType of(int val) { + switch (val) { + case 0: + return ResultType.Str; + case 1: + return ResultType.Int; + case 2: + return ResultType.Nil; + case 3: + return ResultType.Data; + case 4: + return ResultType.Bulk; + case 5: + return ResultType.Ok; + case 6: + return ResultType.Err; + default: + return ResultType.Undef; + } + } + }; + + public interface RustLib extends Library { + + public BabushkaResultStr.ByValue static_function_which_throws(); + + public BabushkaResultStr.ByValue static_function4(); + + // public BabushkaResult.ByValue static_function2_0(); + public BabushkaResult.ByValue static_function2_0(); + + public BabushkaResult.ByValue static_function2_1(); + + public BabushkaResult.ByValue static_function2_2(); + + public BabushkaResult.ByValue static_function2_3(); + + public BabushkaResult.ByValue static_function2_4(); + + @Structure.FieldOrder({"error", "result"}) + public static class BabushkaResultStr extends Structure { + public static class ByValue extends BabushkaResultStr implements Structure.ByValue {} + + public String error; + public String result; + } + + @Structure.FieldOrder({"error", "value_type", "string", "num"}) + public static class BabushkaResult extends Structure { + public BabushkaResult() { + error = null; + value_type = 0; + string = null; + num = 0; + } + + public static class ByValue extends BabushkaResult implements Structure.ByValue {} + + public String error = null; + public int value_type = 0; + public String string = null; + public long num = 0; + } + + public long init_client0(int data); + + public BabushkaResult.ByValue connect0(long client, String address); + + public BabushkaResult.ByValue test0(long client, String address); + + public BabushkaResult.ByValue set0(long client, String key, String value); + + public BabushkaResult.ByValue get0(long client, String key); + } + + public static void main(String[] args) { + var is_win = System.getProperty("os.name").contains("Windows"); + var targetDir = + Paths.get( + "jna-stuff", "build", "resources", "main", is_win ? "win32-x86-64" : "linux-x86-64") + .toAbsolutePath(); + + // System.setProperty("jna.debug_load", "true"); + System.setProperty("jna.library.path", targetDir.toString()); + + var created = targetDir.toFile().mkdirs(); + try { + if (is_win) { + Files.copy( + Paths.get(System.getProperty("user.dir"), "target", "debug", "javababushka.dll"), + Paths.get(targetDir.toString(), "javababushka.dll"), + StandardCopyOption.REPLACE_EXISTING); + } else { + Files.copy( + Paths.get( + System.getProperty("user.dir"), "..", "target", "debug", "libjavababushka.so"), + Paths.get(targetDir.toString(), "libjavababushka.so"), + StandardCopyOption.REPLACE_EXISTING); + } + } catch (IOException e) { + System.out.printf("Failed to copy lib: %s%n", e.getMessage()); + e.printStackTrace(); + } + + // System.out.println("Working Directory = " + System.getProperty("jna.library.path")); + + var lib = (RustLib) Native.load("javababushka", RustLib.class); + var res = lib.static_function_which_throws(); + + var res4 = lib.static_function4(); + + var res2_0 = lib.static_function2_0(); + var res2_1 = lib.static_function2_1(); + var res2_2 = lib.static_function2_2(); + var res2_3 = lib.static_function2_3(); + var res2_4 = lib.static_function2_4(); + int a = 5; + + var bab = lib.init_client0(42); + var t1 = lib.test0(bab, "pewpew"); + var t2 = lib.test0(bab, "ololo"); + var t3 = lib.test0(bab, "ikiki"); + + System.out.println("Before connect"); + var con = lib.connect0(bab, "redis://127.0.0.1:6379"); + System.out.println("After connect"); + if (con.value_type == ResultType.Ok.id) { + System.out.println("Connected"); + } else { + System.out.printf( + "Conn failed: Res = %s, str = %s, err = %s%n", + ResultType.of(con.value_type), con.string, con.error); + } + + System.out.println("=======\nBefore set"); + var set = lib.set0(bab, "kkkey", "ololo"); + System.out.println("After set"); + if (set.value_type == ResultType.Ok.id) { + System.out.println("Set ok"); + } else { + System.out.printf( + "Set failed: Res = %s, str = %s, err = %s%n", + ResultType.of(set.value_type), set.string, set.error); + } + + System.out.println("=======\nBefore get1"); + var get1 = lib.get0(bab, "kkkey"); + System.out.println("After get1"); + if (get1.value_type == ResultType.Str.id) { + System.out.printf("Get1 existing ok: %s%n", get1.string); + } else { + System.out.printf( + "Set failed: Res = %s, str = %s, err = %s%n", + ResultType.of(get1.value_type), get1.string, get1.error); + } + + System.out.println("=======\nBefore get2"); + var get2 = lib.get0(bab, "kkk"); + System.out.println("After get2"); + if (get2.value_type == ResultType.Str.id) { + System.out.printf("Get2 not existing ok: %s%n", get2.string); + } else { + System.out.printf( + "Set failed: Res = %s, str = %s, err = %s%n", + ResultType.of(get2.value_type), get2.string, get2.error); + } + + int b = 5; + } +} diff --git a/java/kotlin-sample/build.gradle b/java/kotlin-sample/build.gradle new file mode 100644 index 0000000000..7b75df24b4 --- /dev/null +++ b/java/kotlin-sample/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' + id 'application' +} + +dependencies { + // Required for interop + implementation "net.java.dev.jna:jna:5.8.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20" + + implementation files("../../kotlin/client/build/libs/kotlinbabushka-0.0.1.jar") +} + +application { + mainClass = 'babushka.javababushka' +} diff --git a/java/kotlin-sample/src/main/java/babushka/javababushka.java b/java/kotlin-sample/src/main/java/babushka/javababushka.java new file mode 100644 index 0000000000..772a7539a5 --- /dev/null +++ b/java/kotlin-sample/src/main/java/babushka/javababushka.java @@ -0,0 +1,66 @@ +package babushka; + +import static babushka.KotlibbabushkaKt.staticFunction; +import static babushka.KotlibbabushkaKt.staticFunctionWhichThrows; + +public class javababushka { + + public static void main(String[] args) { + + var d = staticFunction(); + + try { + var c = staticFunctionWhichThrows(); + } catch (BabushkaException e) { + throw new RuntimeException(e); + } + + var b = new BabushkaClient().classFunction(); + var a = 42; + + System.out.println("Before babushka"); + var babushka = new BabushkaClient(); + System.out.println("after babushka"); + BabushkaClientData data = null; + + try { + data = babushka.connect("redis://127.0.0.1:6379"); + System.out.println("connected"); + } catch (BabushkaRedisException e) { + System.out.printf("Failed to connect: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + var missing = babushka.get(data, "keyadsf"); + System.out.printf("get missing: %s %n", missing); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get3 missing: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + babushka.set(data, "key", "val"); + System.out.println("set"); + } catch (BabushkaRedisException e) { + System.out.printf("failed to set: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + var value = babushka.get(data, "key"); + System.out.printf("get non missing: %s %n", value); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get value: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + var value = babushka.get(data, "keyuuuu"); + System.out.printf("get missing: %s %n", value); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get value: %s%n", e.getMessage()); + e.printStackTrace(); + } + } +} diff --git a/java/settings.gradle b/java/settings.gradle index c392c65247..f8255d2261 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -3,3 +3,5 @@ rootProject.name = 'javababushka' include 'client' include 'integTest' include 'benchmarks' +include 'jna-stuff' +include 'kotlin-sample' diff --git a/java/src/lib.rs b/java/src/lib.rs index e69de29bb2..ecf214d034 100644 --- a/java/src/lib.rs +++ b/java/src/lib.rs @@ -0,0 +1,541 @@ +use jni::objects::{JClass, JObject, JStaticFieldID, JString}; +use jni::JNIEnv; +use jni::sys::{jclass, jfieldID, jint, jlong, jstring}; +//use log::error; +use log::{debug, error}; + +use redis::{AsyncCommands, Client, RedisResult, Value}; +use redis::aio::MultiplexedConnection; +use tokio::runtime::{Builder, Runtime}; +use std::os::raw::c_char; +use std::ffi::{CStr,CString}; +use std::str; +use std::mem; +use std::ptr::null; +use std::sync::{Mutex}; + + + +#[no_mangle] +pub extern fn static_function_which_throws() -> BabushkaResultStr { + BabushkaResultStr { error: str_to_ptr(""), result: str_to_ptr("hello from rust -> static function which throws") } +} + +#[no_mangle] +pub extern fn static_function4() -> BabushkaResultStr { + BabushkaResultStr { error: str_to_ptr("pewpew"), result: null() } +} + +#[no_mangle] +pub extern fn static_function2_0() -> BabushkaResult { + //BabushkaResult::from_str(str_to_ptr("ololo")) + BabushkaResult { + error: null(), + value_type: ResultType::Str as u32, + str: str_to_ptr("ololo"), + num: 0 + } +} + +#[no_mangle] +pub extern fn static_function2_1() -> BabushkaResult { + //BabushkaResult::from_err(str_to_ptr("oh no")) + BabushkaResult { + error: str_to_ptr("oh no"), + value_type: ResultType::Err as u32, + str: null(), + num: 0 + } +} + +#[no_mangle] +pub extern fn static_function2_2() -> BabushkaResult { + //BabushkaResult::from_int(100500) + BabushkaResult { + error: null(), + value_type: ResultType::Int as u32, + str: null(), + num: 100500 + } +} + +#[no_mangle] +pub extern fn static_function2_3() -> BabushkaResult { + //BabushkaResult::from_ok() + BabushkaResult { + error: null(), + value_type: ResultType::Ok as u32, + str: null(), + num: 0 + } +} + +#[no_mangle] +pub extern fn static_function2_4() -> BabushkaResult { + BabushkaResult { + error: null(), + value_type: ResultType::Nil as u32, + str: null(), + num: 0 + } +} + +/// Convert a native string to a Rust string +fn ptr_to_string(pointer: * const c_char) -> String { + let slice = unsafe { CStr::from_ptr(pointer).to_bytes() }; + str::from_utf8(slice).unwrap().to_string() +} + +/// Convert a native string to a Rust string +fn ptr_to_str(pointer: * const c_char) -> &'static str { + let slice = unsafe { CStr::from_ptr(pointer).to_bytes() }; + str::from_utf8(slice).unwrap() +} + +/// Convert a Rust string to a native string +fn string_to_ptr(string: String) -> * const c_char { + let cs = CString::new(string.as_bytes()).unwrap(); + let ptr = cs.as_ptr(); + // Tell Rust not to clean up the string while we still have a pointer to it. + // Otherwise, we'll get a segfault. + mem::forget(cs); + ptr +} + +/// Convert a Rust string to a native string +fn str_to_ptr(string: &str) -> * const c_char { + let cs = CString::new(string.as_bytes()).unwrap(); + let ptr = cs.as_ptr(); + // Tell Rust not to clean up the string while we still have a pointer to it. + // Otherwise, we'll get a segfault. + mem::forget(cs); + ptr +} + +#[repr(C)] +pub struct BabushkaResultStr { + pub error: * const c_char, + pub result: * const c_char +} + +use num_derive::FromPrimitive; +use num_traits::FromPrimitive; + +// redis::Value +#[derive(FromPrimitive)] +pub enum ResultType { + Str = 0, // * const c_char + Int = 1, // i64 + Nil = 2, + Data = 3, // Vec + Bulk = 4, // Vec + Ok = 5, + Err = 6 +} + +fn BabushkaResult_from_error<'local>(env: &mut JNIEnv<'local>, error: String) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&env.new_string(error.clone()).unwrap()).into(), + jint::from(ResultType::Err as i32).into(), + (&JObject::null()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from error {}: {}", error, err) + } + JObject::null() +} + +fn BabushkaResult_from_ok<'local>(env: &mut JNIEnv<'local>) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&JObject::null()).into(), + jint::from(ResultType::Ok as i32).into(), + (&JObject::null()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from ok: {}", err) + } + JObject::null() +} + +fn BabushkaResult_from_string<'local>(env: &mut JNIEnv<'local>, string: String) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&JObject::null()).into(), + jint::from(ResultType::Str as i32).into(), + (&env.new_string(string.clone()).unwrap()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from string {}: {}", string, err) + } + JObject::null() +} + +fn BabushkaResult_from_empty_string<'local>(env: &mut JNIEnv<'local>) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&JObject::null()).into(), + jint::from(ResultType::Str as i32).into(), + (&JObject::null()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from empty string: {}", err) + } + JObject::null() +} + +#[repr(C)] +pub struct BabushkaResult { + pub error: * const c_char, + pub value_type: u32, //ResultType, + pub str: * const c_char, + pub num: i64, +} + +impl BabushkaResult { + pub fn from_str(str: String) -> Self { + Self { + error: null(), + value_type: ResultType::Str as u32, + str: string_to_ptr(str), + num: 0, + } + } + + pub fn from_empty_str() -> Self { + Self { + error: null(), + value_type: ResultType::Str as u32, + str: null(), + num: 0, + } + } + + pub fn from_int(int: i64) -> Self { + Self { + error: null(), + value_type: ResultType::Int as u32, + str: null(), + num: int, + } + } + + pub fn from_err(err: String) -> Self { + Self { + error: string_to_ptr(err), + value_type: ResultType::Err as u32, + str: null(), + num: 0, + } + } + + pub fn from_nil() -> Self { + Self { + error: null(), + value_type: ResultType::Nil as u32, + str: null(), + num: 0, + } + } + + pub fn from_ok() -> Self { + Self { + error: null(), + value_type: ResultType::Ok as u32, + str: null(), + num: 0, + } + } + + pub fn get_type(&self) -> ResultType { + // unsafe { std::mem::transmute(self.value_type as u32) }; + ResultType::from_u32(self.value_type).unwrap() + } + + pub fn get_err(&self) -> String { + ptr_to_string(self.error) + } + + pub fn get_str(&self) -> String { + ptr_to_string(self.str) + } + + pub fn get_int(&self) -> i64 { + self.num + } + // TODO other types +} + + +#[repr(C)] +pub struct BabushkaClient { + runtime: Option>, + connection: Option>, + data: i32 +} + +#[link_section = ".init_array"] +pub static INITIALIZE: extern "C" fn() = rust_ctor; + +#[no_mangle] +pub extern "C" fn rust_ctor() { + env_logger::init(); +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_init_1client<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + data: jint +) -> jlong { + let p = Box::::into_raw(Box::new( + BabushkaClient { + runtime: None, + connection: None, + data + })); + jlong::from(p as i64) +} + +#[no_mangle] +pub extern fn init_client0(data: i32) -> u64 { + let p = Box::::into_raw(Box::new( + BabushkaClient { + runtime: None, + connection: None, + data + })); + p as u64 + //p.into(); +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_test<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + data: jstring +) -> JObject<'local> { + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + babushka.data += 15; + + let err = JObject::null(); + let res_type = jint::from(ResultType::Ok as i32); + let str = env.new_string(format!("{} {:?}", babushka.data, data)).unwrap(); + let num = Box::::into_raw(babushka) as i64; + + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&err).into(), + (res_type).into(), + (&str).into(), + (num).into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("{}", err) + } + JObject::null() +} + + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_connect<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + address: JString +) -> JObject<'local> { + let addr : String = env.get_string(&address).unwrap().into(); + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + let client_res = redis::Client::open(addr); + + let client : Client; + + match client_res { + Ok(c) => client = c, + Err(err) => return BabushkaResult_from_error(&mut env, err.to_string()) + } + + let runtime_res = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka java thread") + .build(); + + let runtime : Runtime; + + match runtime_res { + Ok(rt) => runtime = rt, + Err(err) => return BabushkaResult_from_error(&mut env, err.to_string()) + } + + let _runtime_handle = runtime.enter(); + + let connection_res = runtime + .block_on(client.get_multiplexed_async_connection()); + + let connection : MultiplexedConnection; + + match connection_res { + Ok(c) => connection = c, + Err(err) => return BabushkaResult_from_error(&mut env, err.to_string()) + } + + babushka.runtime = Some(Mutex::new(runtime)); + babushka.connection = Some(Mutex::new(connection)); + + Box::::into_raw(babushka); + BabushkaResult_from_ok(&mut env) +} + + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_set<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + key: jstring, + value: jstring +) -> JObject<'local> { + let key_str : String = env.get_string(&unsafe { JString::from_raw(key) }).unwrap().into(); + let value_str : String = env.get_string(&unsafe { JString::from_raw(value) }).unwrap().into(); + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap() + .set::(key_str, value_str).await + }); + Box::::into_raw(babushka); + match res { + Ok(_) => BabushkaResult_from_ok(&mut env), + Err(err) => BabushkaResult_from_error(&mut env, err.to_string()) + } +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_get<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + key: jstring +) -> JObject<'local> { + let key_str : String = env.get_string(&unsafe { JString::from_raw(key) }).unwrap().into(); + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap().get::>(key_str).await + }); + Box::::into_raw(babushka); + match res { + Ok(Some(val)) => BabushkaResult_from_string(&mut env, val), + Ok(None) => BabushkaResult_from_empty_string(&mut env), + Err(err) => BabushkaResult_from_error(&mut env, err.to_string()) + } +} + +#[no_mangle] +pub extern fn test0(ptr: u64, address: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + babushka.data += 15; + BabushkaResult { + error: null(), + value_type: ResultType::Ok as u32, + str: string_to_ptr(format!("{} {}", babushka.data, ptr_to_string(address))), + num: Box::::into_raw(babushka) as i64, + } +} + +//* +#[no_mangle] +pub extern fn connect0(ptr: u64, address: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + let client_res = redis::Client::open(ptr_to_string(address)); + let client : Client; + + match client_res { + Ok(c) => client = c, + Err(err) => return BabushkaResult::from_err(err.to_string()) + } + + let runtime_res = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka java thread") + .build(); + + let runtime : Runtime; + + match runtime_res { + Ok(rt) => runtime = rt, + Err(err) => return BabushkaResult::from_err(err.to_string()) + } + + let _runtime_handle = runtime.enter(); + + let connection_res = runtime + .block_on(client.get_multiplexed_async_connection()); + + let connection : MultiplexedConnection; + + match connection_res { + Ok(c) => connection = c, + Err(err) => return BabushkaResult::from_err(err.to_string()) + } + + babushka.runtime = Some(Mutex::new(runtime)); + babushka.connection = Some(Mutex::new(connection)); + + Box::::into_raw(babushka); + BabushkaResult::from_ok() +} + +#[no_mangle] +pub extern fn set0(ptr: u64, key: * const c_char, value: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap() + .set::(ptr_to_string(key), ptr_to_string(value)).await + }); + Box::::into_raw(babushka); + match res { + Ok(_) => BabushkaResult::from_ok(), + Err(err) => BabushkaResult::from_err(err.to_string()) + } +} + +#[no_mangle] +pub extern fn get0(ptr: u64, key: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap().get::>(ptr_to_string(key)).await + }); + Box::::into_raw(babushka); + match res { + Ok(Some(val)) => BabushkaResult::from_str(val), + Ok(None) => BabushkaResult::from_empty_str(), + Err(err) => BabushkaResult::from_err(err.to_string()) + } +} diff --git a/kotlin/.gitignore b/kotlin/.gitignore new file mode 100644 index 0000000000..4353c2d811 --- /dev/null +++ b/kotlin/.gitignore @@ -0,0 +1,16 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore gradle wrapper files (they are managed by gradle) +gradlew +gradlew.bat +gradle + +# Ignore Gradle build output directory +build + +# IDE files +.idea + +# All client sources are autogenerated +client/src diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts new file mode 100644 index 0000000000..45055baab8 --- /dev/null +++ b/kotlin/build.gradle.kts @@ -0,0 +1,14 @@ +buildscript { + repositories { + mavenCentral() + } +} + +allprojects { + group = "babushka" + version = "0.0.1" + + repositories { + mavenCentral() + } +} diff --git a/kotlin/client/build.gradle.kts b/kotlin/client/build.gradle.kts new file mode 100644 index 0000000000..1b48689014 --- /dev/null +++ b/kotlin/client/build.gradle.kts @@ -0,0 +1,40 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.9.10" + `java-library` + + // Custom plugin to generate the native libs and bindings file + id("babushka.plugin.generate-jvm-bindings") +} + +// This task dependency ensures that we build the bindings +// binaries before running the tests +tasks.withType { + dependsOn("buildJvmLib") + + kotlinOptions { + jvmTarget = "11" + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + withSourcesJar() + withJavadocJar() +} + +dependencies { + implementation(platform("org.jetbrains.kotlin:kotlin-bom")) + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7") + implementation("net.java.dev.jna:jna:5.8.0") +} + +tasks.jar { + manifest { + attributes(mapOf("Implementation-Title" to "kotlinbabushka", + "Implementation-Version" to project.version)) + } + archiveBaseName.set("kotlinbabushka") +} diff --git a/kotlin/gradle.properties b/kotlin/gradle.properties new file mode 100644 index 0000000000..7fc6f1ff27 --- /dev/null +++ b/kotlin/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/kotlin/gradle/wrapper/gradle-wrapper.jar b/kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..249e5832f0 Binary files /dev/null and b/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/kotlin/gradle/wrapper/gradle-wrapper.properties b/kotlin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..15de90249f --- /dev/null +++ b/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kotlin/gradlew b/kotlin/gradlew new file mode 100755 index 0000000000..1b6c787337 --- /dev/null +++ b/kotlin/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/kotlin/gradlew.bat b/kotlin/gradlew.bat new file mode 100755 index 0000000000..107acd32c4 --- /dev/null +++ b/kotlin/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/kotlin/interop/.cargo/config.toml b/kotlin/interop/.cargo/config.toml new file mode 100644 index 0000000000..c8e15bc8bf --- /dev/null +++ b/kotlin/interop/.cargo/config.toml @@ -0,0 +1,3 @@ +[env] +BABUSHKA_NAME = { value = "BabushkaKo", force = true } +BABUSHKA_VERSION = "0.1.0" diff --git a/kotlin/interop/Cargo.toml b/kotlin/interop/Cargo.toml new file mode 100644 index 0000000000..1d626b6bd9 --- /dev/null +++ b/kotlin/interop/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "kotlinbabushka" +version = "0.1.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 = "kotlinbabushka" +crate-type = ["lib", "staticlib", "cdylib"] + +[[bin]] +name = "uniffi-bindgen" +path = "uniffi-bindgen.rs" + +[features] +default = ["uniffi/cli"] + + +[dependencies] +redis = { path = "../../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } +tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } +logger_core = {path = "../../logger_core"} +tracing-subscriber = "0.3.16" +uniffi = "0.23.0" +thiserror = "1.0.49" + +[build-dependencies] +uniffi = { version = "0.23.0", features = ["build"] } + +[dev-dependencies] +uniffi = { version = "0.23.0", features = ["bindgen-tests"] } +assert_matches = "1.5.0" + +[profile.release] +lto = true +debug = true + +[profile.release-smaller] +inherits = "release" +opt-level = 'z' # Optimize for size. +lto = true # Enable Link Time Optimization +codegen-units = 1 # Reduce number of codegen units to increase optimizations. +panic = 'abort' # Abort on panic +strip = true # Strip symbols from binary diff --git a/kotlin/interop/build.rs b/kotlin/interop/build.rs new file mode 100644 index 0000000000..7cc75f8d3e --- /dev/null +++ b/kotlin/interop/build.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::generate_scaffolding("./src/babushka.udl").unwrap(); +} diff --git a/kotlin/interop/src/babushka.udl b/kotlin/interop/src/babushka.udl new file mode 100644 index 0000000000..e46d39608f --- /dev/null +++ b/kotlin/interop/src/babushka.udl @@ -0,0 +1,56 @@ + +[Error] +enum BabushkaError { + "Oops", +}; + +[Error] +enum BabushkaRedisError { + "ResponseError", + "AuthenticationFailed", + "TypeError", + "ExecAbortError", + "BusyLoadingError", + "NoScriptError", + "InvalidClientConfig", + "Moved", + "Ask", + "TryAgain", + "ClusterDown", + "CrossSlot", + "MasterDown", + "IoError", + "ClientError", + "ExtensionError", + "ReadOnly", + "MasterNameNotFoundBySentinel", + "NoValidReplicasFoundBySentinel", + "EmptySentinelList", + "NotBusy", +}; + +namespace kotlibbabushka { + + [Throws=BabushkaError] + string static_function_which_throws(); + + string static_function(); +}; + +interface BabushkaClientData { + +}; + +interface BabushkaClient { + constructor(); + string class_function(); + + [Throws=BabushkaRedisError] + BabushkaClientData connect(string address); + + [Throws=BabushkaRedisError] + void set(BabushkaClientData data, string key, string? value); + + [Throws=BabushkaRedisError] + string? get(BabushkaClientData data, string key); +}; diff --git a/kotlin/interop/src/lib.rs b/kotlin/interop/src/lib.rs new file mode 100644 index 0000000000..abb1010470 --- /dev/null +++ b/kotlin/interop/src/lib.rs @@ -0,0 +1,147 @@ +use std::fmt::Formatter; +use std::sync::{Arc, Mutex}; +use redis::aio::MultiplexedConnection; +use redis::{ErrorKind, FromRedisValue, RedisResult, Value}; +use redis::{AsyncCommands, RedisError}; +use tokio::runtime::Builder; +use tokio::runtime::Runtime; + +uniffi::include_scaffolding!("babushka"); + +#[derive(Debug, thiserror::Error)] +pub enum BabushkaError { + #[error("...")] + Oops, +} + + +#[derive(Debug, thiserror::Error)] +pub enum BabushkaRedisError { + ResponseError, + AuthenticationFailed, + TypeError, + ExecAbortError, + BusyLoadingError, + NoScriptError, + InvalidClientConfig, + Moved, + Ask, + TryAgain, + ClusterDown, + CrossSlot, + MasterDown, + IoError, + ClientError, + ExtensionError, + ReadOnly, + MasterNameNotFoundBySentinel, + NoValidReplicasFoundBySentinel, + EmptySentinelList, + NotBusy +} + +impl std::fmt::Display for BabushkaRedisError { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} + +fn convert_to_babushka_error(err: RedisError) -> BabushkaRedisError { + match err.kind() { + ErrorKind::ResponseError => BabushkaRedisError::ResponseError, + ErrorKind::AuthenticationFailed => BabushkaRedisError::AuthenticationFailed, + ErrorKind::TypeError => BabushkaRedisError::TypeError, + ErrorKind::ExecAbortError => BabushkaRedisError::ExecAbortError, + ErrorKind::BusyLoadingError => BabushkaRedisError::BusyLoadingError, + ErrorKind::NoScriptError => BabushkaRedisError::NoScriptError, + ErrorKind::InvalidClientConfig => BabushkaRedisError::InvalidClientConfig, + ErrorKind::Moved => BabushkaRedisError::Moved, + ErrorKind::Ask => BabushkaRedisError::Ask, + ErrorKind::TryAgain => BabushkaRedisError::TryAgain, + ErrorKind::ClusterDown => BabushkaRedisError::ClusterDown, + ErrorKind::CrossSlot => BabushkaRedisError::CrossSlot, + ErrorKind::MasterDown => BabushkaRedisError::MasterDown, + ErrorKind::IoError => BabushkaRedisError::IoError, + ErrorKind::ClientError => BabushkaRedisError::ClientError, + ErrorKind::ExtensionError => BabushkaRedisError::ExtensionError, + ErrorKind::ReadOnly => BabushkaRedisError::ReadOnly, + ErrorKind::MasterNameNotFoundBySentinel => BabushkaRedisError::MasterNameNotFoundBySentinel, + ErrorKind::NoValidReplicasFoundBySentinel => BabushkaRedisError::NoValidReplicasFoundBySentinel, + ErrorKind::EmptySentinelList => BabushkaRedisError::EmptySentinelList, + ErrorKind::NotBusy => BabushkaRedisError::NotBusy, + //ErrorKind::Serialize => {} +// _ => BabushkaRedisError::__ + _ => todo!() + } +} + +pub fn static_function_which_throws() -> Result { + Ok("hello from rust -> static function which throws".into()) +} + +pub fn static_function() -> String { + "hello from rust -> static function".into() +} + +pub struct BabushkaClient { +} + +pub struct BabushkaClientData { + runtime: Mutex, + connection: Mutex, +} + +impl BabushkaClient { + pub fn new() -> Self { + Self { } + } + + pub fn class_function(&self) -> String { + "hello from rust -> class function".into() + } + + pub fn connect(&self, address: String) -> Result, BabushkaRedisError> { + match self.inner_connect(address) { + Ok(data) => Ok(data), + Err(err) => Err(convert_to_babushka_error(err)) + } + } + + fn inner_connect(&self, address: String) -> Result, RedisError> { + let client = redis::Client::open(address)?; + let runtime = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka kotlin thread") + .build()?; + + let _runtime_handle = runtime.enter(); + + let connection = + runtime + .block_on(client.get_multiplexed_async_connection())?; + + Ok(Arc::new(BabushkaClientData { runtime : Mutex::new(runtime), connection : Mutex::new(connection)} )) + } + + pub fn set(&self, data: Arc, key: String, value: Option) -> Result<(), BabushkaRedisError> { + let res = data.runtime.lock().unwrap().block_on(async { + data.connection.lock().unwrap() + .set::, ()>(key, value).await + }); + match res { + Ok(_) => Ok(()), + Err(err) => Err(convert_to_babushka_error(err)) + } + } + + pub fn get(&self, data: Arc, key: String) -> Result, BabushkaRedisError> { + let res = data.runtime.lock().unwrap().block_on(async { + data.connection.lock().unwrap().get::>(key).await + }); + match res { + Ok(val) => Ok(val), + Err(err) => Err(convert_to_babushka_error(err)) + } + } +} diff --git a/kotlin/interop/uniffi-bindgen.rs b/kotlin/interop/uniffi-bindgen.rs new file mode 100644 index 0000000000..f6cff6cf1d --- /dev/null +++ b/kotlin/interop/uniffi-bindgen.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::uniffi_bindgen_main() +} diff --git a/kotlin/interop/uniffi.toml b/kotlin/interop/uniffi.toml new file mode 100644 index 0000000000..d64e720f92 --- /dev/null +++ b/kotlin/interop/uniffi.toml @@ -0,0 +1,12 @@ +[bindings.kotlin] +package_name = "babushka" +cdylib_name = "kotlinbabushka" + +[bindings.python] +cdylib_name = "kotlinbabushka" + +[bindings.ruby] +cdylib_name = "kotlinbabushka" + +[bindings.swift] +cdylib_name = "kotlinbabushka" diff --git a/kotlin/plugin/build.gradle.kts b/kotlin/plugin/build.gradle.kts new file mode 100644 index 0000000000..8f78983141 --- /dev/null +++ b/kotlin/plugin/build.gradle.kts @@ -0,0 +1,18 @@ +repositories { + mavenCentral() + gradlePluginPortal() +} + +plugins { + id("java-gradle-plugin") + `kotlin-dsl` +} + +gradlePlugin { + plugins { + create("uniFfiJvmBindings") { + id = "babushka.plugin.generate-jvm-bindings" + implementationClass = "babushka.UniFfiJvmPlugin" + } + } +} diff --git a/kotlin/plugin/src/main/kotlin/babushka/Enums.kt b/kotlin/plugin/src/main/kotlin/babushka/Enums.kt new file mode 100644 index 0000000000..a8a7a8e7c8 --- /dev/null +++ b/kotlin/plugin/src/main/kotlin/babushka/Enums.kt @@ -0,0 +1,16 @@ +package babushka + + +val operatingSystem: OS = when { + System.getProperty("os.name").contains("mac", ignoreCase = true) -> OS.MAC + System.getProperty("os.name").contains("linux", ignoreCase = true) -> OS.LINUX + System.getProperty("os.name").contains("windows", ignoreCase = true) -> OS.WINDOWS + else -> OS.OTHER +} + +enum class OS { + MAC, + LINUX, + WINDOWS, + OTHER, +} diff --git a/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt b/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt new file mode 100644 index 0000000000..ac9e96100d --- /dev/null +++ b/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt @@ -0,0 +1,141 @@ +package babushka + +import org.gradle.api.DefaultTask +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.tasks.Exec +import org.gradle.kotlin.dsl.getValue +import org.gradle.kotlin.dsl.provideDelegate +import org.gradle.kotlin.dsl.register + +internal class UniFfiJvmPlugin : Plugin { + override fun apply(target: Project): Unit = target.run { +//* + // register a task called buildJvmBinaries which will run something like + // cargo build --release --target aarch64-apple-darwin + val buildJvmBinaries by tasks.register("buildJvmBinaries") { + if (operatingSystem == OS.MAC) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-apple-darwin") + args(cargoArgs) + } + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "aarch64-apple-darwin") + args(cargoArgs) + } + } else if (operatingSystem == OS.LINUX) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-unknown-linux-gnu") + args(cargoArgs) + } + } else if (operatingSystem == OS.WINDOWS) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-pc-windows-msvc") + args(cargoArgs) + } + } + } + + // move the native libs build by cargo from target/.../release/ + // to their place in the jvm library + val moveNativeJvmLibs by tasks.register("moveNativeJvmLibs") { + + // dependsOn(buildJvmBinaryX86_64MacOS, buildJvmBinaryAarch64MacOS, buildJvmBinaryLinux) + dependsOn(buildJvmBinaries) + + data class CopyMetadata(val targetDir: String, val ext: String) + val libsToCopy: MutableList = mutableListOf() + var resDir = "" + + if (operatingSystem == OS.MAC) { + resDir = "darwin-aarch64" + libsToCopy.add( + CopyMetadata( + targetDir = "aarch64-apple-darwin", + ext = "dylib" + ) + ) + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-apple-darwin", + ext = "dylib" + ) + ) + } else if (operatingSystem == OS.LINUX) { + resDir = "linux-x86-64" + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-unknown-linux-gnu", + ext = "so" + ) + ) + } else if (operatingSystem == OS.WINDOWS) { + resDir = "win32-x86-64" + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-pc-windows-msvc", + ext = "dll" + ) + ) + } + val libName = when (operatingSystem) { + OS.WINDOWS -> "kotlinbabushka" + else -> "libkotlinbabushka" + } + + val destDir = "$rootDir/client/src/main/resources/${resDir}/" + mkdir(destDir) + + libsToCopy.forEach { + doFirst { + copy { + with(it) { + from("$rootDir/interop/target/${this.targetDir}/release-smaller/${libName}.${this.ext}") + into(destDir) + } + } + } + } + } + + // generate the bindings using the bindgen tool + val generateJvmBindings by tasks.register("generateJvmBindings") { + + dependsOn(moveNativeJvmLibs) + + workingDir("$rootDir/interop") + val cargoArgs: List = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/babushka.udl", + "--language", "kotlin", "--out-dir", "../client/src/main/kotlin", "--no-format") + + executable("cargo") + args(cargoArgs) + + doLast { + println("JVM bindings file successfully created") + } + } +//*/ + // we need an aggregate task which will run the 3 required tasks to build the JVM libs in order + // the task will also appear in the printout of the ./gradlew tasks task with a group and description + tasks.register("buildJvmLib") { + group = "babushka" + description = "Aggregate task to build JVM library" + + dependsOn( + //* + buildJvmBinaries, + moveNativeJvmLibs, + generateJvmBindings + //*/ + ) + } + } +} diff --git a/kotlin/settings.gradle.kts b/kotlin/settings.gradle.kts new file mode 100644 index 0000000000..bd7df3933a --- /dev/null +++ b/kotlin/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "kotlinbabushka" + +include("client") +includeBuild("plugin")