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

Remove superfluous quotes from non-cql typenames

Browse Source 
PYTHON-579
This commit is contained in:
Adam Holmberg
2016-07-19 14:03:26 -05:00
parent d8d0456bad
commit f0cfc69378
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cassandra/cqltypes.py
View File

@@ -107,7 +107,7 @@ class CassandraTypeType(type):
cls = type.__new__(metacls, name, bases, dct) cls = type.__new__(metacls, name, bases, dct)
if not name.startswith('_'): if not name.startswith('_'):
_casstypes[name] = cls _casstypes[name] = cls
if not cls.typename.startswith("'org"): if not cls.typename.startswith(apache_cassandra_type_prefix):
_cqltypes[cls.typename] = cls _cqltypes[cls.typename] = cls
return cls return cls
@@ -853,7 +853,7 @@ class TupleType(_ParameterizedType):
class UserType(TupleType): class UserType(TupleType):
typename = "'org.apache.cassandra.db.marshal.UserType'" typename = "org.apache.cassandra.db.marshal.UserType"
_cache = {} _cache = {}
_module = sys.modules[__name__] _module = sys.modules[__name__]
@@ -956,7 +956,7 @@ class UserType(TupleType):
class CompositeType(_ParameterizedType): class CompositeType(_ParameterizedType):
typename = "'org.apache.cassandra.db.marshal.CompositeType'" typename = "org.apache.cassandra.db.marshal.CompositeType"
num_subtypes = 'UNKNOWN' num_subtypes = 'UNKNOWN'
@classmethod @classmethod
@@ -986,7 +986,7 @@ class CompositeType(_ParameterizedType):
class DynamicCompositeType(CompositeType): class DynamicCompositeType(CompositeType):
typename = "'org.apache.cassandra.db.marshal.DynamicCompositeType'" typename = "org.apache.cassandra.db.marshal.DynamicCompositeType"
class ColumnToCollectionType(_ParameterizedType): class ColumnToCollectionType(_ParameterizedType):
@@ -995,12 +995,12 @@ class ColumnToCollectionType(_ParameterizedType):
Cassandra includes this. We don't actually need or want the extra Cassandra includes this. We don't actually need or want the extra
information. information.
""" """
typename = "'org.apache.cassandra.db.marshal.ColumnToCollectionType'" typename = "org.apache.cassandra.db.marshal.ColumnToCollectionType"
num_subtypes = 'UNKNOWN' num_subtypes = 'UNKNOWN'
class ReversedType(_ParameterizedType): class ReversedType(_ParameterizedType):
typename = "'org.apache.cassandra.db.marshal.ReversedType'" typename = "org.apache.cassandra.db.marshal.ReversedType"
num_subtypes = 1 num_subtypes = 1
@classmethod @classmethod

1
cassandra/metadata.py
View File

@@ -1058,7 +1058,6 @@ class TableMetadata(object):
""" """
comparator = getattr(self, 'comparator', None) comparator = getattr(self, 'comparator', None)
if comparator: if comparator:
# no such thing as DCT in CQL
incompatible = issubclass(self.comparator, types.DynamicCompositeType) incompatible = issubclass(self.comparator, types.DynamicCompositeType)
# no compact storage with more than one column beyond PK if there # no compact storage with more than one column beyond PK if there

1
cassandra/type_codes.py
View File

@@ -59,4 +59,3 @@ MapType = 0x0021
SetType = 0x0022 SetType = 0x0022
UserType = 0x0030 UserType = 0x0030
TupleType = 0x0031 TupleType = 0x0031