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

Handle custom types by full classname lookup

Browse Source
This commit is contained in:
Tyler Hobbs
2014-02-13 16:23:49 -06:00
parent f0fc2288fc
commit 6bd519b8f9
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@@ -8,6 +8,7 @@ Bug Fixes
* Fix broken token awareness on ByteOrderedPartitioner * Fix broken token awareness on ByteOrderedPartitioner
* Always close socket when defuncting error'ed connections to avoid a potential * Always close socket when defuncting error'ed connections to avoid a potential
file descriptor leak file descriptor leak
* Handle "custom" types (such as the replaced DateType) correctly
Other Other
----- -----

14
cassandra/decoder.py
View File

@@ -28,7 +28,7 @@ from cassandra.cqltypes import (AsciiType, BytesType, BooleanType,
DoubleType, FloatType, Int32Type, DoubleType, FloatType, Int32Type,
InetAddressType, IntegerType, ListType, InetAddressType, IntegerType, ListType,
LongType, MapType, SetType, TimeUUIDType, LongType, MapType, SetType, TimeUUIDType,
UTF8Type, UUIDType) UTF8Type, UUIDType, lookup_casstype)
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -424,6 +424,9 @@ class QueryMessage(_MessageType):
write_consistency_level(f, self.consistency_level) write_consistency_level(f, self.consistency_level)
CUSTOM_TYPE = object()
class ResultMessage(_MessageType): class ResultMessage(_MessageType):
opcode = 0x08 opcode = 0x08
name = 'RESULT' name = 'RESULT'
@@ -436,6 +439,7 @@ class ResultMessage(_MessageType):
KIND_SCHEMA_CHANGE = 0x0005 KIND_SCHEMA_CHANGE = 0x0005
type_codes = { type_codes = {
0x0000: CUSTOM_TYPE,
0x0001: AsciiType, 0x0001: AsciiType,
0x0002: LongType, 0x0002: LongType,
0x0003: BytesType, 0x0003: BytesType,
@@ -525,8 +529,8 @@ class ResultMessage(_MessageType):
try: try:
typeclass = cls.type_codes[optid] typeclass = cls.type_codes[optid]
except KeyError: except KeyError:
raise NotSupportedError("Unknown data type code 0x%x. Have to skip" raise NotSupportedError("Unknown data type code 0x%04x. Have to skip"
" entire result set." % optid) " entire result set." % (optid,))
if typeclass in (ListType, SetType): if typeclass in (ListType, SetType):
subtype = cls.read_type(f) subtype = cls.read_type(f)
typeclass = typeclass.apply_parameters(subtype) typeclass = typeclass.apply_parameters(subtype)
@@ -534,6 +538,10 @@ class ResultMessage(_MessageType):
keysubtype = cls.read_type(f) keysubtype = cls.read_type(f)
valsubtype = cls.read_type(f) valsubtype = cls.read_type(f)
typeclass = typeclass.apply_parameters(keysubtype, valsubtype) typeclass = typeclass.apply_parameters(keysubtype, valsubtype)
elif typeclass == CUSTOM_TYPE:
classname = read_string(f)
typeclass = lookup_casstype(classname)
return typeclass return typeclass
@staticmethod @staticmethod