client-routes: include original_port in endpoint identity

Author: dkropachev

cassandra/connection.py

@@ -428,7 +428,7 @@ class ClientRoutesEndPoint(EndPoint):
     _host_id: uuid.UUID
     _handler: _ClientRoutesHandler
     _original_address: str
-    _original_port: int
+    _original_port: Optional[int]
 
     def __init__(self, host_id: uuid.UUID, handler: _ClientRoutesHandler, original_address: str, original_port: int = None) -> None:
         """
@@ -467,15 +467,24 @@ def resolve(self) -> Tuple[str, int]:
 
     def __eq__(self, other):
         return (isinstance(other, ClientRoutesEndPoint) and
-                self._host_id == other._host_id and
-                self._original_address == other._original_address)
+                self._identity_key() == other._identity_key())
 
     def __hash__(self):
-        return hash((self._host_id, self._original_address))
+        return hash(self._identity_key())
 
     def __lt__(self, other):
-        return ((self._host_id, self._original_address) <
-                (other._host_id, other._original_address))
+        return self._ordering_key() < other._ordering_key()
+
+    def _identity_key(self):
+        return self._host_id, self._original_address, self._original_port
+
+    def _ordering_key(self):
+        return (
+            self._host_id,
+            self._original_address,
+            self._original_port is None,
+            self._original_port,
+        )
 
     def __str__(self):
         return str("%s (host_id=%s)" % (self._original_address, self._host_id))

tests/unit/test_client_routes.py

@@ -433,6 +433,44 @@ def test_resolve_falls_back_when_no_mapping(self):
         )
         self.assertEqual(ep.resolve(), ("10.0.0.1", 9042))
 
+    def test_original_port_is_part_of_identity(self):
+        """Endpoints that only differ by original port should not compare equal."""
+        host_id = uuid.uuid4()
+        ep_without_port = ClientRoutesEndPoint(
+            host_id=host_id,
+            handler=self.handler,
+            original_address="10.0.0.1",
+        )
+        ep_with_port = ClientRoutesEndPoint(
+            host_id=host_id,
+            handler=self.handler,
+            original_address="10.0.0.1",
+            original_port=9042,
+        )
+
+        self.assertNotEqual(ep_without_port, ep_with_port)
+        self.assertNotEqual(hash(ep_without_port), hash(ep_with_port))
+
+    def test_sorting_handles_missing_original_port(self):
+        """Ordering should remain deterministic when original_port is None."""
+        host_id = uuid.uuid4()
+        ep_without_port = ClientRoutesEndPoint(
+            host_id=host_id,
+            handler=self.handler,
+            original_address="10.0.0.1",
+        )
+        ep_with_port = ClientRoutesEndPoint(
+            host_id=host_id,
+            handler=self.handler,
+            original_address="10.0.0.1",
+            original_port=9042,
+        )
+
+        self.assertEqual(
+            sorted([ep_without_port, ep_with_port]),
+            [ep_with_port, ep_without_port],
+        )
+
     @patch('cassandra.client_routes.socket.getaddrinfo',
            return_value=[(socket.AF_INET, socket.SOCK_STREAM, 0, '', ("192.168.1.100", 9042))])
     def test_resolve_returns_address_when_route_exists(self, _mock_getaddrinfo):