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

Merge pull request #342 from datastax/329

Browse Source 
PYTHON-329 - Update custom payload value encoding for CASSADNRA-9515
This commit is contained in:
Adam Holmberg
2015-06-03 09:56:03 -05:00
parent c050a96bc7 8949200222
commit 911c6a1915
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cassandra/protocol.py
View File

@@ -1019,11 +1019,6 @@ def read_binary_string(f):
return contents return contents
def write_binary_string(f, s):
write_short(f, len(s))
f.write(s)
def write_string(f, s): def write_string(f, s):
if isinstance(s, six.text_type): if isinstance(s, six.text_type):
s = s.encode('utf8') s = s.encode('utf8')
@@ -1080,7 +1075,7 @@ def read_bytesmap(f):
bytesmap = {} bytesmap = {}
for _ in range(numpairs): for _ in range(numpairs):
k = read_string(f) k = read_string(f)
bytesmap[k] = read_binary_string(f) bytesmap[k] = read_value(f)
return bytesmap return bytesmap
@@ -1088,7 +1083,7 @@ def write_bytesmap(f, bytesmap):
write_short(f, len(bytesmap)) write_short(f, len(bytesmap))
for k, v in bytesmap.items(): for k, v in bytesmap.items():
write_string(f, k) write_string(f, k)
write_binary_string(f, v) write_value(f, v)
def read_stringmultimap(f): def read_stringmultimap(f):