Split netty client into two files

babushka-core/src/socket_listener.rs

@@ -210,7 +210,7 @@ async fn write_result(
                     error_message.into(),
                 ))
             } else {
-                log_warn("received error", error_message.as_str());
+                log_warn("received error", format!("{} for callback {}", error_message.as_str(), callback_index));
                 let mut request_error = response::RequestError::default();
                 if err.is_connection_dropped() {
                     request_error.type_ = response::RequestErrorType::Disconnect.into();
@@ -476,7 +476,7 @@ fn handle_request(request: RedisRequest, client: Client, writer: Rc<Writer>) {
                 }
             },
             None => Err(ClienUsageError::InternalError(
-                "Received empty request".to_string(),
+                format!("Received empty request for callback {}", request.callback_idx),
             )),
         };
 

java/benchmarks/src/main/java/javababushka/benchmarks/clients/babushka/JniNettyClient.java

@@ -23,11 +23,6 @@ public String getName() {
     return name;
   }
 
-  @Override
-  public void closeConnection() {
-    testClient.closeConnection();
-  }
-
   @Override
   public void connectToRedis() {
     connectToRedis(new ConnectionSettings("localhost", 6379, false, false));

java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java

@@ -127,6 +127,7 @@ public static void printResults(
     System.out.printf("Iterations: %d%n", iterations);
     System.out.printf("TPS: %f%n", iterations / duration);
     int totalHits = 0;
+
     for (Map.Entry<ChosenAction, LatencyResults> entry : resultsMap.entrySet()) {
       ChosenAction action = entry.getKey();
       LatencyResults results = entry.getValue();
@@ -140,7 +141,7 @@ public static void printResults(
       System.out.printf("Total hits: %d%n", results.totalHits);
       totalHits += results.totalHits;
     }
-    System.out.println("Total hits: " + totalHits);
+    System.out.printf("%nTotal hits: %d%n", totalHits);
   }
 
   public static void testClientSetGet(

java/client/build.gradle

@@ -18,6 +18,12 @@ dependencies {
     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'
+
+    //lombok
+    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'
 }
 
 tasks.register('protobuf', Exec) {
@@ -60,6 +66,7 @@ tasks.register('buildAll') {
 }
 
 compileJava.dependsOn('protobuf')
+
 clean.dependsOn('cleanProtobuf')
 
 tasks.withType(Test) {