Skip to content

[RFC] (improvement)Remove CQL binary protocol v3 #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mykaul wants to merge 1 commit into from
Closed

[RFC] (improvement)Remove CQL binary protocol v3 #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions cassandra/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,6 @@ class ProtocolVersion(object):
Defines native protocol versions supported by this driver.
"""

V3 = 3
"""
v3, supported in Cassandra 2.1-->3.x+;
added support for protocol-level client-side timestamps (see :attr:`.Session.use_client_timestamp`),
serial consistency levels for :class:`~.BatchStatement`, and an improved connection pool.
"""

V4 = 4
"""
v4, supported in Cassandra 2.2-->3.x+;
Expand Down Expand Up @@ -170,9 +163,9 @@ class ProtocolVersion(object):
DSE private protocol v2, supported in DSE 6.0+
"""

SUPPORTED_VERSIONS = (V5, V4, V3)
SUPPORTED_VERSIONS = (V5, V4)
"""
A tuple of all supported protocol versions for ScyllaDB, including future v5 version.
A tuple of all supported protocol versions for ScyllaDB.
"""

BETA_VERSIONS = (V6,)
Expand Down
26 changes: 4 additions & 22 deletions cassandra/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,12 +735,7 @@
try:
self._auth_provider_callable = value.new_authenticator
except AttributeError:
if self.protocol_version > 1:
raise TypeError("auth_provider must implement the cassandra.auth.AuthProvider "
"interface when protocol_version >= 2")
elif not callable(value):
raise TypeError("auth_provider must be callable when protocol_version == 1")
self._auth_provider_callable = value
raise TypeError("auth_provider must implement the cassandra.auth.AuthProvider interface")

self._auth_provider = value

Expand Down Expand Up @@ -1557,7 +1552,7 @@

Example::

cluster = Cluster(protocol_version=3)
cluster = Cluster()
session = cluster.connect()
session.set_keyspace('mykeyspace')
session.execute("CREATE TYPE address (street text, zipcode int)")
Expand All @@ -1582,11 +1577,6 @@
print(row.id, row.location.street, row.location.zipcode)

"""
if self.protocol_version < 3:
log.warning("User Type serialization is only supported in native protocol version 3+ (%d in use). "
"CQL encoding for simple statements will still work, but named tuples will "
"be returned when reading type %s.%s.", self.protocol_version, keyspace, user_type)

self._user_types[keyspace][user_type] = klass
for session in tuple(self.sessions):
session.user_type_registered(keyspace, user_type, klass)
Expand Down Expand Up @@ -2442,8 +2432,6 @@
The default :class:`~ConsistencyLevel` for serial phase of conditional updates executed through
this session. This default may be overridden by setting the
:attr:`~.Statement.serial_consistency_level` on individual statements.

Only valid for ``protocol_version >= 2``.
"""
return self._default_serial_consistency_level

Expand Down Expand Up @@ -2954,11 +2942,6 @@
continuous_paging_options=continuous_paging_options,
result_metadata_id=prepared_statement.result_metadata_id)
elif isinstance(query, BatchStatement):
if self._protocol_version < 2:
raise UnsupportedOperation(
"BatchStatement execution is only supported with protocol version "
"2 or higher (supported in Cassandra 2.0 and higher). Consider "
"setting Cluster.protocol_version to 2 to support this operation.")
statement_keyspace = query.keyspace if ProtocolVersion.uses_keyspace_flag(self._protocol_version) else None
message = BatchMessage(
query.batch_type, query._statements_and_parameters, cl,
Expand Down Expand Up @@ -3097,7 +3080,7 @@
prepared_keyspace = keyspace if keyspace else None
prepared_statement = PreparedStatement.from_message(
response.query_id, response.bind_metadata, response.pk_indexes, self.cluster.metadata, query, prepared_keyspace,
self._protocol_version, response.column_metadata, response.result_metadata_id, response.is_lwt, self.cluster.column_encryption_policy)
response.column_metadata, response.result_metadata_id, response.is_lwt, self.cluster.column_encryption_policy)
prepared_statement.custom_payload = future.custom_payload

self.cluster.add_prepared(response.query_id, prepared_statement)
Expand Down Expand Up @@ -4243,7 +4226,7 @@
self._scheduled_tasks.discard(task)
fn, args, kwargs = task
kwargs = dict(kwargs)
future = self._executor.submit(fn, *args, **kwargs)

Check failure on line 4229 in cassandra/cluster.py

View workflow job for this annotation

GitHub Actions / test asyncio (3.11) 

cannot schedule new futures after shutdown
future.add_done_callback(self._log_if_failed)
else:
self._queue.put_nowait((run_at, i, task))
Expand Down Expand Up @@ -4637,10 +4620,9 @@
self._custom_payload = getattr(response, 'custom_payload', None)

if self._custom_payload and self.session.cluster.control_connection._tablets_routing_v1 and 'tablets-routing-v1' in self._custom_payload:
protocol = self.session.cluster.protocol_version
info = self._custom_payload.get('tablets-routing-v1')
ctype = types.lookup_casstype('TupleType(LongType, LongType, ListType(TupleType(UUIDType, Int32Type)))')
tablet_routing_info = ctype.from_binary(info, protocol)
tablet_routing_info = ctype.from_binary(info)
first_token = tablet_routing_info[0]
last_token = tablet_routing_info[1]
tablet_replicas = tablet_routing_info[2]
Expand Down
8 changes: 4 additions & 4 deletions cassandra/cqlengine/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ def __str__(self):
', '.join('{0}={1}'.format(k, getattr(self, k)) for k in self._primary_keys.keys()))

@classmethod
def _routing_key_from_values(cls, pk_values, protocol_version):
return cls._key_serializer(pk_values, protocol_version)
def _routing_key_from_values(cls, pk_values):
return cls._key_serializer(pk_values)

@classmethod
def _discover_polymorphic_submodels(cls):
Expand Down Expand Up @@ -948,10 +948,10 @@ def _transform_column(col_name, col_obj):
key_cols = [c for c in partition_keys.values()]
partition_key_index = dict((col.db_field_name, col._partition_key_index) for col in key_cols)
key_cql_types = [c.cql_type for c in key_cols]
key_serializer = staticmethod(lambda parts, proto_version: [t.to_binary(p, proto_version) for t, p in zip(key_cql_types, parts)])
key_serializer = staticmethod(lambda parts: [t.to_binary(p) for t, p in zip(key_cql_types, parts)])
else:
partition_key_index = {}
key_serializer = staticmethod(lambda parts, proto_version: None)
key_serializer = staticmethod(lambda parts: None)

# setup partition key shortcut
if len(partition_keys) == 0:
Expand Down
2 changes: 1 addition & 1 deletion cassandra/cqlengine/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,7 @@ def _execute_statement(model, statement, consistency_level, timeout, connection=
if model._partition_key_index:
key_values = statement.partition_key_values(model._partition_key_index)
if not any(v is None for v in key_values):
parts = model._routing_key_from_values(key_values, conn.get_cluster(connection).protocol_version)
parts = model._routing_key_from_values(key_values)
s.routing_key = parts
s.keyspace = model._get_keyspace()
connection = connection or model._get_connection()
Expand Down
Loading
Loading