Client clean up.

Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Nov 16, 2023 · a70c907 · a70c907
1 parent dd7413b
commit a70c907
Show file tree

Hide file tree

Showing 19 changed files with 464 additions and 14,649 deletions.
diff --git a/java/benchmarks/build.gradle b/java/benchmarks/build.gradle
@@ -10,6 +10,8 @@ repositories {
 }
 
 dependencies {
+    implementation project(':client')
+
     // Use JUnit test framework.
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
 
@@ -24,13 +26,6 @@ dependencies {
     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'
 
@@ -50,8 +45,7 @@ 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"
+    applicationDefaultJvmArgs += "-Djava.library.path=${projectDir}/../target/release"
 }
 
 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
@@ -5,9 +5,7 @@
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import javababushka.benchmarks.clients.babushka.JniNettyClient;
-import javababushka.benchmarks.clients.babushka.JniSyncClient;
 import javababushka.benchmarks.clients.jedis.JedisClient;
 import javababushka.benchmarks.clients.jedis.JedisPseudoAsyncClient;
 import javababushka.benchmarks.clients.lettuce.LettuceAsyncClient;
@@ -63,15 +61,11 @@ public static void main(String[] args) {
         case LETTUCE_ASYNC:
           testClientSetGet(LettuceAsyncClient::new, runConfiguration, true);
           break;
-        case BABUSHKA_JNI:
-          testClientSetGet(JniSyncClient::new, runConfiguration, false);
-          break;
-        case JNI_NETTY:
+        case BABUSHKA:
           testClientSetGet(() -> new JniNettyClient(false), runConfiguration, false);
-          testClientSetGet(() -> new JniNettyClient(true), runConfiguration, true);
           break;
         case BABUSHKA_ASYNC:
-          System.out.println("Babushka async not yet configured");
+          testClientSetGet(() -> new JniNettyClient(true), runConfiguration, true);
           break;
       }
     }
@@ -147,7 +141,6 @@ private static RunConfiguration verifyOptions(CommandLine line) throws ParseExce
                             ClientName.JEDIS_ASYNC,
                             // ClientName.BABUSHKA_ASYNC,
                             ClientName.BABUSHKA,
-                            ClientName.BABUSHKA_JNI,
                             ClientName.LETTUCE,
                             ClientName.LETTUCE_ASYNC);
                       case ALL_ASYNC:
@@ -159,7 +152,6 @@ private static RunConfiguration verifyOptions(CommandLine line) throws ParseExce
                         return Stream.of(
                             ClientName.JEDIS,
                             // ClientName.BABUSHKA,
-                            ClientName.BABUSHKA_JNI,
                             ClientName.LETTUCE);
                       default:
                         return Stream.of(e);
@@ -201,12 +193,10 @@ private static int[] parseIntListOption(String line) throws ParseException {
   }
 
   public enum ClientName {
-    JNI_NETTY("JNI netty"),
     JEDIS("Jedis"),
     JEDIS_ASYNC("Jedis async"),
     LETTUCE("Lettuce"),
     LETTUCE_ASYNC("Lettuce async"),
-    BABUSHKA_JNI("JNI sync"),
     BABUSHKA_ASYNC("Babushka async"),
     BABUSHKA("Babushka"),
     ALL("All"),
@@ -243,14 +233,16 @@ public static class RunConfiguration {
 
     public RunConfiguration() {
       configuration = "Release";
-      resultsFile = Optional.of("res_java.json");//Optional.empty();
+      resultsFile = Optional.of("res_java.json"); // Optional.empty();
       dataSize = new int[] {100};
       concurrentTasks = new int[] {100};
       clients =
           new ClientName[] {
             // ClientName.BABUSHKA_ASYNC,
-            //ClientName.JEDIS, ClientName.JEDIS_ASYNC, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC
-              ClientName.JNI_NETTY//, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC
+            // ClientName.JEDIS, ClientName.JEDIS_ASYNC, ClientName.LETTUCE,
+            // ClientName.LETTUCE_ASYNC
+            ClientName.BABUSHKA_ASYNC,
+            ClientName.BABUSHKA // , ClientName.LETTUCE, ClientName.LETTUCE_ASYNC
           };
       host = "localhost";
       port = 6379;

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/clients/AsyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/clients/AsyncClient.java
@@ -1,9 +1,8 @@
 package javababushka.benchmarks.clients;
 
-import javababushka.benchmarks.utils.ConnectionSettings;
-
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 /** A Redis client with async capabilities */
 public interface AsyncClient<T> extends Client {

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/clients/babushka/ChannelHandler.java b/java/benchmarks/src/main/java/javababushka/benchmarks/clients/babushka/ChannelHandler.java