cqle: model attribute to disable routing key computation

aholmberg · aholmberg · commit 5c09da62faad · 2016-04-04T14:56:54.000-05:00
PYTHON-535
diff --git a/cassandra/cqlengine/models.py b/cassandra/cqlengine/models.py
@@ -335,6 +335,8 @@ class MultipleObjectsReturned(_MultipleObjectsReturned):
 
     __options__ = None
 
+    __compute_routing_key__ = True
+
     # the queryset class used for this class
     __queryset__ = query.ModelQuerySet
     __dmlquery__ = query.DMLQuery
@@ -871,10 +873,14 @@ def _get_polymorphic_base(bases):
         partition_keys = OrderedDict(k for k in primary_keys.items() if k[1].partition_key)
         clustering_keys = OrderedDict(k for k in primary_keys.items() if not k[1].partition_key)
 
-        key_cols = [c for c in partition_keys.values()]
-        partition_key_index = dict((col.db_field_name, col._partition_key_index) for col in key_cols)
-        key_cql_types = [c.cql_type for c in key_cols]
-        key_serializer = staticmethod(lambda parts, proto_version: [t.to_binary(p, proto_version) for t, p in zip(key_cql_types, parts)])
+        if attrs.get('__compute_routing_key__', True):
+            key_cols = [c for c in partition_keys.values()]
+            partition_key_index = dict((col.db_field_name, col._partition_key_index) for col in key_cols)
+            key_cql_types = [c.cql_type for c in key_cols]
+            key_serializer = staticmethod(lambda parts, proto_version: [t.to_binary(p, proto_version) for t, p in zip(key_cql_types, parts)])
+        else:
+            partition_key_index = {}
+            key_serializer = staticmethod(lambda parts, proto_version: None)
 
         # setup partition key shortcut
         if len(partition_keys) == 0:
@@ -998,3 +1004,8 @@ class Model(BaseModel):
     """
     *Optional* Specifies a value for the discriminator column when using model inheritance.
     """
+
+    __compute_routing_key__ = True
+    """
+    *Optional* Setting False disables computing the routing key for TokenAwareRouting
+    """
diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py
@@ -1344,9 +1344,10 @@ def delete(self):
 def _execute_statement(model, statement, consistency_level, timeout):
     params = statement.get_context()
     s = SimpleStatement(str(statement), consistency_level=consistency_level, fetch_size=statement.fetch_size)
-    if model._partition_key_index:  # not available on NamedTable
+    if model._partition_key_index:
         key_values = statement.partition_key_values(model._partition_key_index)
         if not any(v is None for v in key_values):
             parts = model._routing_key_from_values(key_values, connection.get_cluster().protocol_version)
             s.routing_key = parts
+            s.keyspace = model._get_keyspace()
     return connection.execute(s, params, timeout=timeout)
diff --git a/cassandra/cqlengine/statements.py b/cassandra/cqlengine/statements.py
@@ -504,7 +504,7 @@ def _update_part_key_values(self, field_index_map, clauses, parts):
 
     def partition_key_values(self, field_index_map):
         parts = [None] * len(field_index_map)
-        self._update_part_key_values(field_index_map, (w for w in self.where_clauses if isinstance(w, EqualsOperator)), parts)
+        self._update_part_key_values(field_index_map, (w for w in self.where_clauses if isinstance(w.operator, EqualsOperator)), parts)
         return parts
 
     def add_where(self, column, operator, value, quote_field=True):
diff --git a/docs/api/cassandra/cqlengine/models.rst b/docs/api/cassandra/cqlengine/models.rst
@@ -79,6 +79,8 @@ Model
                                               'tombstone_compaction_interval': '86400'},
                                'gc_grace_seconds': '0'}
 
+    .. autoattribute:: __compute_routing_key__
+
 
     The base methods allow creating, storing, and querying modeled objects.
 
