Merge "Remove unused token.valid index"

keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py

@@ -0,0 +1,33 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import sqlalchemy as sql
+
+
+def upgrade(migrate_engine):
+    meta = sql.MetaData()
+    meta.bind = migrate_engine
+    token = sql.Table('token', meta, autoload=True)
+    idx = sql.Index('ix_token_valid', token.c.valid)
+    idx.drop(migrate_engine)
+
+
+def downgrade(migrate_engine):
+    meta = sql.MetaData()
+    meta.bind = migrate_engine
+    token = sql.Table('token', meta, autoload=True)
+    idx = sql.Index('ix_token_valid', token.c.valid)
+    idx.create(migrate_engine)

keystone/tests/test_sql_upgrade.py

@@ -1344,6 +1344,13 @@ class SqlUpgradeTests(SqlMigrateBase):
         self.assertIn(('ix_token_expires_valid', ['expires', 'valid']),
                       index_data)
 
+    def test_dropped_valid_index(self):
+        self.upgrade(36)
+        table = sqlalchemy.Table('token', self.metadata, autoload=True)
+        index_data = [(idx.name, idx.columns.keys())
+                      for idx in table.indexes]
+        self.assertNotIn(('ix_token_valid', ['valid']), index_data)
+
     def test_migrate_ec2_credential(self):
         user = {
             'id': 'foo',

keystone/token/backends/sql.py

@@ -33,7 +33,6 @@ class TokenModel(sql.ModelBase, sql.DictBase):
     trust_id = sql.Column(sql.String(64))
     __table_args__ = (
         sql.Index('ix_token_expires', 'expires'),
-        sql.Index('ix_token_valid', 'valid'),
         sql.Index('ix_token_expires_valid', 'expires', 'valid')
     )