(cassandra-sidecar) branch trunk updated: CASSANDRASC-123: Add missing method to retrieve the InetSocketAddress to DriverUtils (#114)

[frankgh]

This is an automated email from the ASF dual-hosted git repository.

frankgh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 77c8150  CASSANDRASC-123: Add missing method to retrieve the 
InetSocketAddress to DriverUtils (#114)
77c8150 is described below

commit 77c815071a66fb53b97e9e07695417004dd88804
Author: Francisco Guerrero <fran...@apache.org>
AuthorDate: Tue Apr 23 10:44:28 2024 -0700

    CASSANDRASC-123: Add missing method to retrieve the InetSocketAddress to 
DriverUtils (#114)
    
    Patch by Francisco Guerrero; Reviewed by Yifan Cai for CASSANDRASC-123
---
 .../apache/cassandra/sidecar/common/utils/DriverUtils.java    | 11 +++++++++++
 .../cassandra/sidecar/cluster/CassandraAdapterDelegate.java   |  2 +-
 .../cassandra/sidecar/cluster/SidecarLoadBalancingPolicy.java |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git 
a/common/src/main/java/org/apache/cassandra/sidecar/common/utils/DriverUtils.java
 
b/common/src/main/java/org/apache/cassandra/sidecar/common/utils/DriverUtils.java
index b070637..aea1351 100644
--- 
a/common/src/main/java/org/apache/cassandra/sidecar/common/utils/DriverUtils.java
+++ 
b/common/src/main/java/org/apache/cassandra/sidecar/common/utils/DriverUtils.java
@@ -54,4 +54,15 @@ public class DriverUtils
     {
         return com.datastax.driver.core.DriverUtils.getHost(metadata, 
localNativeTransportAddress);
     }
+
+    /**
+     * Returns the address that the driver will use to connect to the node.
+     *
+     * @param host the host to which reconnect attempts will be made
+     * @return the address.
+     */
+    public InetSocketAddress getSocketAddress(Host host)
+    {
+        return host.getEndPoint().resolve();
+    }
 }
diff --git 
a/src/main/java/org/apache/cassandra/sidecar/cluster/CassandraAdapterDelegate.java
 
b/src/main/java/org/apache/cassandra/sidecar/cluster/CassandraAdapterDelegate.java
index cc0a952..5a1628d 100644
--- 
a/src/main/java/org/apache/cassandra/sidecar/cluster/CassandraAdapterDelegate.java
+++ 
b/src/main/java/org/apache/cassandra/sidecar/cluster/CassandraAdapterDelegate.java
@@ -547,7 +547,7 @@ public class CassandraAdapterDelegate implements 
ICassandraAdapter, Host.StateLi
 
     private void runIfThisHost(Host host, Runnable runnable)
     {
-        if 
(this.localNativeTransportAddress.equals(host.getEndPoint().resolve()))
+        if 
(this.localNativeTransportAddress.equals(driverUtils.getSocketAddress(host)))
         {
             runnable.run();
         }
diff --git 
a/src/main/java/org/apache/cassandra/sidecar/cluster/SidecarLoadBalancingPolicy.java
 
b/src/main/java/org/apache/cassandra/sidecar/cluster/SidecarLoadBalancingPolicy.java
index bd6ae95..7bbe6be 100644
--- 
a/src/main/java/org/apache/cassandra/sidecar/cluster/SidecarLoadBalancingPolicy.java
+++ 
b/src/main/java/org/apache/cassandra/sidecar/cluster/SidecarLoadBalancingPolicy.java
@@ -233,6 +233,6 @@ class SidecarLoadBalancingPolicy implements 
LoadBalancingPolicy
 
     private boolean isLocalHost(Host host)
     {
-        return localHostAddresses.contains(host.getEndPoint().resolve());
+        return localHostAddresses.contains(driverUtils.getSocketAddress(host));
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org