Fix index target for collection indexes

thobbs · thobbs · commit 077b876fdd38 · 2015-02-06T18:53:43.000-06:00
diff --git a/cassandra/cqltypes.py b/cassandra/cqltypes.py
@@ -958,6 +958,21 @@ def serialize_safe(cls, val, protocol_version):
         return subtype.to_binary(val, protocol_version)
 
 
+class FrozenType(_ParameterizedType):
+    typename = "frozen"
+    num_subtypes = 1
+
+    @classmethod
+    def deserialize_safe(cls, byts, protocol_version):
+        subtype, = cls.subtypes
+        return subtype.from_binary(byts)
+
+    @classmethod
+    def serialize_safe(cls, val, protocol_version):
+        subtype, = cls.subtypes
+        return subtype.to_binary(val, protocol_version)
+
+
 def is_counter_type(t):
     if isinstance(t, six.string_types):
         t = lookup_casstype(t)
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
@@ -1210,11 +1210,30 @@ def as_cql_query(self):
         """
         table = self.column.table
         if self.index_type != "CUSTOM":
+            index_target = protect_name(self.column.name)
+            if self.index_options is not None:
+                option_keys = self.index_options.keys()
+                if "index_keys" in option_keys:
+                    index_target = 'keys(%s)' % (index_target,)
+                elif "index_values" in option_keys:
+                    # don't use any "function" for collection values
+                    pass
+                else:
+                    # it might be a "full" index on a frozen collection, but
+                    # we need to check the data type to verify that, because
+                    # there is no special index option for full-collection
+                    # indexes.
+                    data_type = self.column.data_type
+                    collection_types = ('map', 'set', 'list')
+                    if data_type.typename == "frozen" and data_type.subtypes[0].typename in collection_types:
+                        # no index option for full-collection index
+                        index_target = 'full(%s)' % (index_target,)
+
             return "CREATE INDEX %s ON %s.%s (%s)" % (
                 self.name,  # Cassandra doesn't like quoted index names for some reason
                 protect_name(table.keyspace.name),
                 protect_name(table.name),
-                protect_name(self.column.name))
+                index_target)
         else:
             return "CREATE CUSTOM INDEX %s ON %s.%s (%s) USING '%s'" % (
                 self.name,  # Cassandra doesn't like quoted index names for some reason
diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py
@@ -308,6 +308,33 @@ def test_indexes(self):
         self.assertIn('CREATE INDEX d_index', statement)
         self.assertIn('CREATE INDEX e_index', statement)
 
+    def test_collection_indexes(self):
+        self.session.execute("CREATE TABLE %s.%s (a int PRIMARY KEY, b map<text, text>)"
+                             % (self.ksname, self.cfname))
+        self.session.execute("CREATE INDEX index1 ON %s.%s (keys(b))"
+                             % (self.ksname, self.cfname))
+
+        tablemeta = self.get_table_metadata()
+        self.assertIn('(keys(b))', tablemeta.export_as_string())
+
+        self.session.execute("DROP INDEX %s.index1" % (self.ksname,))
+        self.session.execute("CREATE INDEX index2 ON %s.%s (b)"
+                             % (self.ksname, self.cfname))
+
+        tablemeta = self.get_table_metadata()
+        self.assertIn(' (b)', tablemeta.export_as_string())
+
+        # test full indexes on frozen collections, if available
+        if get_server_versions()[0] >= (2, 1, 3):
+            self.session.execute("DROP TABLE %s.%s" % (self.ksname, self.cfname))
+            self.session.execute("CREATE TABLE %s.%s (a int PRIMARY KEY, b frozen<map<text, text>>)"
+                                 % (self.ksname, self.cfname))
+            self.session.execute("CREATE INDEX index3 ON %s.%s (full(b))"
+                                 % (self.ksname, self.cfname))
+
+            tablemeta = self.get_table_metadata()
+            self.assertIn('(full(b))', tablemeta.export_as_string())
+
     def test_compression_disabled(self):
         create_statement = self.make_create_statement(["a"], ["b"], ["c"])
         create_statement += " WITH compression = {}"
