openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Fix nested type deserialization for proto < 3 in cython

Browse Source 
PYTHON-215
This commit is contained in:
Adam Holmberg
2015-11-23 11:14:12 -06:00
parent 293a5cac53
commit b0bb19bd5e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cassandra/deserializers.pyx
View File

@@ -238,7 +238,7 @@ cdef list _deserialize_list_or_set(itemlen_t dummy_version,
_unpack_len[itemlen_t](0, &numelements, buf)
idx = sizeof(itemlen_t)
protocol_version = max(3, protocol_version)
for _ in range(numelements):
subelem(buf, &elem_buf, &idx)
result.append(from_binary(deserializer, &elem_buf, protocol_version))
@@ -325,6 +325,7 @@ cdef _deserialize_map(itemlen_t dummy_version,
_unpack_len[itemlen_t](0, &numelements, buf)
idx = sizeof(itemlen_t)
themap = util.OrderedMapSerializedKey(key_type, protocol_version)
protocol_version = max(3, protocol_version)
for _ in range(numelements):
subelem(buf, &key_buf, &idx)
subelem(buf, &val_buf, &idx)