Merge "Add two missing indexes for instance_uuid columns."

3 files changed, 45 insertions, 0 deletions

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/104_instance_indexes_2.py b/nova/db/sqlalchemy/migrate_repo/versions/104_instance_indexes_2.py
new file mode 100644
index 000000000..4bf6b0484
--- /dev/null
+++ b/nova/db/sqlalchemy/migrate_repo/versions/104_instance_indexes_2.py
@@ -0,0 +1,43 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC.
+# Copyright 2012 Michael Still and Canonical Inc
+# All Rights Reserved.
+#
+#    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.
+
+from sqlalchemy import Index, MetaData, Table
+
+
+def upgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    # NOTE(mikal): these weren't done in 103 because sqlite already has the
+    # index.
+    for table in ['instance_metadata',
+                  'security_group_instance_association']:
+        t = Table(table, meta, autoload=True)
+        i = Index('%s_instance_uuid_idx' % table, t.c.instance_uuid)
+        i.create(migrate_engine)
+
+
+def downgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    for table in ['instance_metadata',
+                  'security_group_instance_association']:
+        t = Table(table, meta, autoload=True)
+        i = Index('%s_instance_uuid_idx' % table, t.c.instance_uuid)
+        i.drop(migrate_engine)
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/104_sqlite_downgrade.sql b/nova/db/sqlalchemy/migrate_repo/versions/104_sqlite_downgrade.sql
new file mode 100644
index 000000000..8d115abb8
--- /dev/null
+++ b/nova/db/sqlalchemy/migrate_repo/versions/104_sqlite_downgrade.sql
@@ -0,0 +1 @@
+SELECT 'noop';
\ No newline at end of file
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/104_sqlite_upgrade.sql b/nova/db/sqlalchemy/migrate_repo/versions/104_sqlite_upgrade.sql
new file mode 100644
index 000000000..8d115abb8
--- /dev/null
+++ b/nova/db/sqlalchemy/migrate_repo/versions/104_sqlite_upgrade.sql
@@ -0,0 +1 @@
+SELECT 'noop';
\ No newline at end of file