Skip to content

Commit 6ae842f

Browse files
Copilotdkropachev
andcommitted
Rename classes per review feedback
Changes requested by @dkropachev: 1. Renamed TLSSessionCache (ABC) to TLSSessionCacheBase in cluster.py 2. Renamed TLSSessionCacheOptions (ABC) to TLSSessionCacheOptionsBase in cluster.py 3. Renamed DefaultTLSSessionCacheOptions to TLSSessionCacheOptions in tls.py 4. Removed session_reused attribute from Connection class Benefits: - Clearer naming convention with "Base" suffix for abstract base classes - Simpler naming for concrete implementations (no "Default" prefix needed) - Reduced complexity by removing unused session_reused tracking Co-authored-by: dkropachev <40304587+dkropachev@users.noreply.github.com>
1 parent 3e65a68 commit 6ae842f

3 files changed

Lines changed: 8 additions & 12 deletions

File tree

cassandra/cluster.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def _connection_reduce_fn(val,import_fn):
204204
from abc import ABC, abstractmethod
205205

206206

207-
class TLSSessionCache(ABC):
207+
class TLSSessionCacheBase(ABC):
208208
"""
209209
Abstract base class for TLS session caching.
210210
@@ -252,7 +252,7 @@ def size(self):
252252
pass
253253

254254

255-
class TLSSessionCacheOptions(ABC):
255+
class TLSSessionCacheOptionsBase(ABC):
256256
"""
257257
Abstract base class for TLS session cache configuration options.
258258
"""
@@ -960,10 +960,10 @@ def default_retry_policy(self, policy):
960960
961961
Example::
962962
963-
from cassandra.tls import DefaultTLSSessionCacheOptions
963+
from cassandra.tls import TLSSessionCacheOptions
964964
965965
# Cache by host only (ignoring port)
966-
options = DefaultTLSSessionCacheOptions(
966+
options = TLSSessionCacheOptions(
967967
max_size=200,
968968
ttl=7200,
969969
cache_by_host_only=True
@@ -1524,11 +1524,11 @@ def __init__(self,
15241524
# Initialize TLS session cache if SSL is enabled
15251525
self._tls_session_cache = None
15261526
if (ssl_context or ssl_options) and tls_session_cache_options is not False:
1527-
from cassandra.tls import DefaultTLSSessionCacheOptions
1527+
from cassandra.tls import TLSSessionCacheOptions
15281528

15291529
# Use provided options or create default
15301530
if tls_session_cache_options is None:
1531-
cache_options = DefaultTLSSessionCacheOptions(
1531+
cache_options = TLSSessionCacheOptions(
15321532
max_size=_DEFAULT_TLS_SESSION_CACHE_SIZE,
15331533
ttl=_DEFAULT_TLS_SESSION_CACHE_TTL,
15341534
cache_by_host_only=False

cassandra/connection.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,6 @@ class Connection(object):
689689
ssl_options = None
690690
ssl_context = None
691691
tls_session_cache = None
692-
session_reused = False
693692
last_error = None
694693

695694
# The current number of operations that are in flight. More precisely,
@@ -775,7 +774,6 @@ def __init__(self, host='127.0.0.1', port=9042, authenticator=None,
775774
self.ssl_options = ssl_options.copy() if ssl_options else {}
776775
self.ssl_context = ssl_context
777776
self.tls_session_cache = tls_session_cache
778-
self.session_reused = False
779777
self.sockopts = sockopts
780778
self.compression = compression
781779
self.cql_version = cql_version
@@ -994,9 +992,7 @@ def _connect_socket(self):
994992
if self.tls_session_cache and self.ssl_context and hasattr(self._socket, 'session'):
995993
if self._socket.session:
996994
self.tls_session_cache.set_session(self.endpoint, self._socket.session)
997-
# Track if the session was reused
998-
self.session_reused = self._socket.session_reused
999-
if self.session_reused:
995+
if self._socket.session_reused:
1000996
log.debug("TLS session was reused for %s:%s",
1001997
self.endpoint.address, self.endpoint.port)
1002998

cassandra/tls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def size(self):
206206
return len(self._sessions)
207207

208208

209-
class DefaultTLSSessionCacheOptions(TLSSessionCacheOptions):
209+
class TLSSessionCacheOptions:
210210
"""
211211
Default implementation of TLS session cache configuration options.
212212
"""

0 commit comments

Comments
 (0)