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

BatchMessage flags were in the wrong place for v3

Browse Source
This commit is contained in:
Tyler Hobbs
2014-06-24 18:25:35 -05:00
parent 9bb087415b
commit 720df07c88
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cassandra/protocol.py
View File

@@ -739,13 +739,6 @@ class BatchMessage(_MessageType):
def send_body(self, f, protocol_version): def send_body(self, f, protocol_version):
write_byte(f, self.batch_type.value) write_byte(f, self.batch_type.value)
if protocol_version >= 3:
flags = 0
if self.serial_consistency_level:
flags |= _WITH_SERIAL_CONSISTENCY_FLAG
if self.timestamp is not None:
flags |= _PROTOCOL_TIMESTAMP
write_byte(f, flags)
write_short(f, len(self.queries)) write_short(f, len(self.queries))
for prepared, string_or_query_id, params in self.queries: for prepared, string_or_query_id, params in self.queries:
if not prepared: if not prepared:
@@ -760,10 +753,18 @@ class BatchMessage(_MessageType):
write_value(f, param) write_value(f, param)
write_consistency_level(f, self.consistency_level) write_consistency_level(f, self.consistency_level)
if protocol_version >= 3 and self.serial_consistency_level: if protocol_version >= 3:
write_consistency_level(f, self.serial_consistency_level) flags = 0
if self.timestamp is not None: if self.serial_consistency_level:
write_long(f, self.timestamp) flags |= _WITH_SERIAL_CONSISTENCY_FLAG
if self.timestamp is not None:
flags |= _PROTOCOL_TIMESTAMP
write_byte(f, flags)
if self.serial_consistency_level:
write_consistency_level(f, self.serial_consistency_level)
if self.timestamp is not None:
write_long(f, self.timestamp)
known_event_types = frozenset(( known_event_types = frozenset((