Skip to content

(improvement) remove protocol_version where possible #642

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

Open
mykaul wants to merge 5 commits into
base: master
Choose a base branch
from
+407 −492
Open

(improvement) remove protocol_version where possible #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
219f266
(improvement) remove protocol_version where possible
mykaul Dec 30, 2025
02dd692
Fix recv_results_rows signature mismatch
mykaul Dec 30, 2025
9a4d0b2
Fix OrderedMapSerializedKey initialization in deserializers
mykaul Dec 30, 2025
41d6adf
Fix protocol_version access in obj_parser.pyx
mykaul Dec 30, 2025
7de86d8
Fix integration tests to use new type API
mykaul Dec 31, 2025
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
2 changes: 1 addition & 1 deletion cassandra/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4317,7 +4317,7 @@
self._scheduled_tasks.discard(task)
fn, args, kwargs = task
kwargs = dict(kwargs)
future = self._executor.submit(fn, *args, **kwargs)

Check failure on line 4320 in cassandra/cluster.py

View workflow job for this annotation

GitHub Actions / test asyncore (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 @@ -4714,7 +4714,7 @@
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(protocol).from_binary(info)
first_token = tablet_routing_info[0]
last_token = tablet_routing_info[1]
tablet_replicas = tablet_routing_info[2]
Expand Down
2 changes: 1 addition & 1 deletion cassandra/column_encryption/_policies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def encode_and_encrypt(self, coldesc, obj):
coldata = self.coldata.get(coldesc)
if not coldata:
raise ValueError("Could not find ColData for ColDesc %s".format(coldesc))
return self.encrypt(coldesc, coldata.type.serialize(obj, None))
return self.encrypt(coldesc, coldata.type(None).serialize(obj))

def cache_info(self):
return AES256ColumnEncryptionPolicy._build_cipher.cache_info()
Expand Down
2 changes: 1 addition & 1 deletion cassandra/cqlengine/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ 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, proto_version: [t(proto_version).to_binary(p) for t, p in zip(key_cql_types, parts)])
else:
partition_key_index = {}
key_serializer = staticmethod(lambda parts, proto_version: None)
Expand Down
Loading
Loading