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

Merge branch '1.x'

Browse Source 
Conflicts:
	CHANGELOG.rst
	cassandra/decoder.py
This commit is contained in:
Tyler Hobbs
2014-05-20 13:44:36 -05:00
parent f48effc89b ae684f05b4
commit fd4f08e7ee
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.rst
View File

@@ -15,6 +15,9 @@ Bug Fixes
named_tuple_factory (PYTHON-56)
* Ensure replication factors are ints for NetworkTopologyStrategy
to avoid TypeErrors (github #120)
* Pass WriteType instance to RetryPolicy.on_write_timeout() instead
of the string name of the write type. This caused write timeout
errors to always be rethrown instead of retrying. (github #123)
Other
-----

8
cassandra/policies.py
View File

@@ -572,6 +572,14 @@ class WriteType(object):
internally before a BATCH write.
"""
WriteType.name_to_value = {
'SIMPLE': WriteType.SIMPLE,
'BATCH': WriteType.BATCH,
'UNLOGGED_BATCH': WriteType.UNLOGGED_BATCH,
'COUNTER': WriteType.COUNTER,
'BATCH_LOG': WriteType.BATCH_LOG,
}
class RetryPolicy(object):
"""

3
cassandra/protocol.py
View File

@@ -30,6 +30,7 @@ from cassandra.cqltypes import (AsciiType, BytesType, BooleanType,
InetAddressType, IntegerType, ListType,
LongType, MapType, SetType, TimeUUIDType,
UTF8Type, UUIDType, lookup_casstype)
from cassandra.policies import WriteType
log = logging.getLogger(__name__)
@@ -233,7 +234,7 @@ class WriteTimeoutErrorMessage(RequestExecutionException):
'consistency': read_consistency_level(f),
'received_responses': read_int(f),
'required_responses': read_int(f),
'write_type': read_string(f),
'write_type': WriteType.name_to_value[read_string(f)],
}
def to_exception(self):