Merge pull request apache#680 from datastax/PYTHON-684

aboudreault · web-flow · commit 3bc5adc5d42b · 2016-12-15T14:57:35.000-05:00
Send a flags field (value 0) in PREPARE messages in v5.
diff --git a/cassandra/protocol.py b/cassandra/protocol.py
@@ -30,7 +30,7 @@
                        UserAggregateDescriptor, SchemaTargetType)
 from cassandra.marshal import (int32_pack, int32_unpack, uint16_pack, uint16_unpack,
                                int8_pack, int8_unpack, uint64_pack, header_pack,
-                               v3_header_pack)
+                               v3_header_pack, uint32_pack)
 from cassandra.cqltypes import (AsciiType, BytesType, BooleanType,
                                 CounterColumnType, DateType, DecimalType,
                                 DoubleType, FloatType, Int32Type,
@@ -561,7 +561,7 @@ def send_body(self, f, protocol_version):
             flags |= _PROTOCOL_TIMESTAMP
 
         if protocol_version >= 5:
-            write_int(f, flags)
+            write_uint(f, flags)
         else:
             write_byte(f, flags)
 
@@ -775,6 +775,9 @@ def __init__(self, query):
 
     def send_body(self, f, protocol_version):
         write_longstring(f, self.query)
+        if protocol_version >= 5:
+            # Write the flags byte; with 0 value for now, but this should change in PYTHON-678
+            write_uint(f, 0)
 
 
 class ExecuteMessage(_MessageType):
@@ -829,7 +832,7 @@ def send_body(self, f, protocol_version):
                 flags |= _SKIP_METADATA_FLAG
 
             if protocol_version >= 5:
-                write_int(f, flags)
+                write_uint(f, flags)
             else:
                 write_byte(f, flags)
 
@@ -1164,6 +1167,10 @@ def write_int(f, i):
     f.write(int32_pack(i))
 
 
+def write_uint(f, i):
+    f.write(uint32_pack(i))
+
+
 def write_long(f, i):
     f.write(uint64_pack(i))
 
