cqle: make NameTable produce part. keys for Token function
PYTHON-260
This commit is contained in:
@@ -881,12 +881,3 @@ class _PartitionKeysToken(Column):
|
|||||||
@property
|
@property
|
||||||
def db_field_name(self):
|
def db_field_name(self):
|
||||||
return 'token({0})'.format(', '.join(['"{0}"'.format(c.db_field_name) for c in self.partition_columns]))
|
return 'token({0})'.format(', '.join(['"{0}"'.format(c.db_field_name) for c in self.partition_columns]))
|
||||||
|
|
||||||
def to_database(self, value):
|
|
||||||
from cqlengine.functions import Token
|
|
||||||
assert isinstance(value, Token)
|
|
||||||
value.set_columns(self.partition_columns)
|
|
||||||
return value
|
|
||||||
|
|
||||||
def get_cql(self):
|
|
||||||
return "token({0})".format(", ".join(c.cql for c in self.partition_columns))
|
|
||||||
|
|||||||
@@ -100,14 +100,12 @@ class MaxTimeUUID(TimeUUIDQueryFunction):
|
|||||||
format_string = 'MaxTimeUUID(%({0})s)'
|
format_string = 'MaxTimeUUID(%({0})s)'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Token(BaseQueryFunction):
|
class Token(BaseQueryFunction):
|
||||||
"""
|
"""
|
||||||
compute the token for a given partition key
|
compute the token for a given partition key
|
||||||
|
|
||||||
http://cassandra.apache.org/doc/cql3/CQL.html#tokenFun
|
http://cassandra.apache.org/doc/cql3/CQL.html#tokenFun
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, *values):
|
def __init__(self, *values):
|
||||||
if len(values) == 1 and isinstance(values[0], (list, tuple)):
|
if len(values) == 1 and isinstance(values[0], (list, tuple)):
|
||||||
values = values[0]
|
values = values[0]
|
||||||
|
|||||||
@@ -12,7 +12,11 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
from cassandra.util import OrderedDict
|
||||||
|
|
||||||
from cassandra.cqlengine import CQLEngineException
|
from cassandra.cqlengine import CQLEngineException
|
||||||
|
from cassandra.cqlengine.columns import Column
|
||||||
|
from cassandra.cqlengine.connection import get_cluster
|
||||||
from cassandra.cqlengine.query import AbstractQueryableColumn, SimpleQuerySet
|
from cassandra.cqlengine.query import AbstractQueryableColumn, SimpleQuerySet
|
||||||
from cassandra.cqlengine.query import DoesNotExist as _DoesNotExist
|
from cassandra.cqlengine.query import DoesNotExist as _DoesNotExist
|
||||||
from cassandra.cqlengine.query import MultipleObjectsReturned as _MultipleObjectsReturned
|
from cassandra.cqlengine.query import MultipleObjectsReturned as _MultipleObjectsReturned
|
||||||
@@ -78,6 +82,8 @@ class NamedTable(object):
|
|||||||
|
|
||||||
objects = QuerySetDescriptor()
|
objects = QuerySetDescriptor()
|
||||||
|
|
||||||
|
__partition_keys = None
|
||||||
|
|
||||||
class DoesNotExist(_DoesNotExist):
|
class DoesNotExist(_DoesNotExist):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -88,6 +94,20 @@ class NamedTable(object):
|
|||||||
self.keyspace = keyspace
|
self.keyspace = keyspace
|
||||||
self.name = name
|
self.name = name
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _partition_keys(self):
|
||||||
|
if not self.__partition_keys:
|
||||||
|
self._get_partition_keys()
|
||||||
|
return self.__partition_keys
|
||||||
|
|
||||||
|
def _get_partition_keys(self):
|
||||||
|
try:
|
||||||
|
table_meta = get_cluster().metadata.keyspaces[self.keyspace].tables[self.name]
|
||||||
|
self.__partition_keys = OrderedDict((pk.name, Column(primary_key=True, partition_key=True, db_field=pk.name)) for pk in table_meta.partition_key)
|
||||||
|
except Exception as e:
|
||||||
|
raise CQLEngineException("Failed inspecting partition keys for {0}."
|
||||||
|
"Ensure cqlengine is connected before attempting this with NamedTable.".format(self.column_family_name()))
|
||||||
|
|
||||||
def column(self, name):
|
def column(self, name):
|
||||||
return NamedColumn(name)
|
return NamedColumn(name)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user