Add clusterModeEnabled to the ConnectionSettings

Signed-off-by: Andrew Carbonetto <[email protected]>
Bit-Quill · Nov 15, 2023 · 6f95345 · 6f95345
1 parent e71a7ac
commit 6f95345
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java
@@ -264,7 +264,7 @@ public RunConfiguration() {
           new ClientName[] {
             // ClientName.BABUSHKA_ASYNC,
             ClientName.JNI_NETTY
-            //            ClientName.LETTUCE_ASYNC
+            // ClientName.LETTUCE_ASYNC
           };
       host = "localhost";
       port = 6379;

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniNettyClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniNettyClient.java
@@ -133,7 +133,7 @@ public String getName() {
 
   @Override
   public void connectToRedis() {
-    connectToRedis(new ConnectionSettings("localhost", 6379, false));
+    connectToRedis(new ConnectionSettings("localhost", 6379, false, false));
   }
 
   @Override
@@ -381,7 +381,7 @@ public Future<Response> asyncConnectToRedis(ConnectionSettings connectionSetting
                 connectionSettings.useSsl // TODO: secure or insecure TLS?
                     ? TlsMode.SecureTls
                     : TlsMode.NoTls)
-            .setClusterModeEnabled(false)
+            .setClusterModeEnabled(connectionSettings.clusterModeEnabled)
             // In millis
             .setResponseTimeout(250)
             // In millis

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClient.java
@@ -20,11 +20,14 @@ public class LettuceAsyncClient implements AsyncClient {
 
   @Override
   public void connectToRedis() {
-    connectToRedis(new ConnectionSettings("localhost", 6379, false));
+    connectToRedis(new ConnectionSettings("localhost", 6379, false, false));
   }
 
   @Override
   public void connectToRedis(ConnectionSettings connectionSettings) {
+    assert connectionSettings.clusterModeEnabled == false
+        : "LettuceAsyncClient invalid with clusterModeEnabled, use LettuceAsyncClusterClient"
+            + " instead";
     client =
         RedisClient.create(
             String.format(

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClusterClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClusterClient.java
@@ -18,11 +18,14 @@ public class LettuceAsyncClusterClient extends LettuceAsyncClient {
 
   @Override
   public void connectToRedis() {
-    connectToRedis(new ConnectionSettings("localhost", 6379, false));
+    connectToRedis(new ConnectionSettings("localhost", 6379, false, true));
   }
 
   @Override
   public void connectToRedis(ConnectionSettings connectionSettings) {
+    assert connectionSettings.clusterModeEnabled == false
+        : "LettuceAsyncClusterClient invalid with clusterModeEnabled disabled, use"
+            + " LettuceAsyncClient instead";
     RedisURI uri =
         RedisURI.builder()
             .withHost(connectionSettings.host)

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceClient.java
@@ -17,7 +17,7 @@ public class LettuceClient implements SyncClient {
 
   @Override
   public void connectToRedis() {
-    connectToRedis(new ConnectionSettings("localhost", 6379, false));
+    connectToRedis(new ConnectionSettings("localhost", 6379, false, false));
   }
 
   @Override

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java
@@ -144,7 +144,9 @@ public static void testClientSetGet(
           List<Client> clients = new LinkedList<>();
           for (int cc = 0; cc < clientCount; cc++) {
             Client newClient = clientCreator.get();
-            newClient.connectToRedis(new ConnectionSettings(config.host, config.port, config.tls));
+            newClient.connectToRedis(
+                new ConnectionSettings(
+                    config.host, config.port, config.tls, config.clusterModeEnabled));
             clients.add(newClient);
           }
 

diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/ConnectionSettings.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/ConnectionSettings.java
@@ -4,10 +4,12 @@ public class ConnectionSettings {
   public String host;
   public int port;
   public boolean useSsl;
+  public boolean clusterModeEnabled;
 
-  public ConnectionSettings(String host, int port, boolean useSsl) {
+  public ConnectionSettings(String host, int port, boolean useSsl, boolean clusterModeEnabled) {
     this.host = host;
     this.port = port;
     this.useSsl = useSsl;
+    this.clusterModeEnabled = clusterModeEnabled;
   }
 }