openstack/neutron
Code Issues Proposed changes

Merge "Add index on db "allocated" columns"

Browse Source
This commit is contained in:
Jenkins 2015-01-27 02:40:44 +00:00 committed by Gerrit Code Review
commit 80f5b360ad
5 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
neutron/db/migration/alembic_migrations/versions/26b54cf9024d_add_index_on_allocated.py Normal file
View File

@ -0,0 +1,50 @@
# Copyright 2015 OpenStack Foundation
#
# 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.
#
"""Add index on allocated
Revision ID: 26b54cf9024d
Revises: 41662e32bce2
Create Date: 2015-01-20 15:49:46.100172
"""
# revision identifiers, used by Alembic.
revision = '26b54cf9024d'
down_revision = '2a1ee2fb59e0'
from alembic import op
def upgrade():
op.create_index(
op.f('ix_ml2_gre_allocations_allocated'),
'ml2_gre_allocations', ['allocated'], unique=False)
op.create_index(
op.f('ix_ml2_vxlan_allocations_allocated'),
'ml2_vxlan_allocations', ['allocated'], unique=False)
op.create_index(
op.f('ix_ml2_vlan_allocations_physical_network_allocated'),
'ml2_vlan_allocations', ['physical_network', 'allocated'],
unique=False)
def downgrade():
op.drop_index(op.f('ix_ml2_vxlan_allocations_allocated'),
table_name='ml2_vxlan_allocations')
op.drop_index(op.f('ix_ml2_gre_allocations_allocated'),
table_name='ml2_gre_allocations')
op.drop_index(op.f('ix_ml2_vlan_allocations_allocated'),
table_name='ml2_vlan_allocations')

2
neutron/db/migration/alembic_migrations/versions/HEAD
View File

@ -1 +1 @@
2a1ee2fb59e0
26b54cf9024d

2
neutron/plugins/ml2/drivers/type_gre.py
View File

@ -47,7 +47,7 @@ class GreAllocation(model_base.BASEV2):
gre_id = sa.Column(sa.Integer, nullable=False, primary_key=True,
autoincrement=False)
allocated = sa.Column(sa.Boolean, nullable=False, default=False,
server_default=sql.false())
server_default=sql.false(), index=True)
class GreEndpoints(model_base.BASEV2):

4
neutron/plugins/ml2/drivers/type_vlan.py
View File

@ -61,6 +61,10 @@ class VlanAllocation(model_base.BASEV2):
"""
__tablename__ = 'ml2_vlan_allocations'
__table_args__ = (
sa.Index('ix_ml2_vlan_allocations_physical_network_allocated',
'physical_network', 'allocated'),
model_base.BASEV2.__table_args__,)
physical_network = sa.Column(sa.String(64), nullable=False,
primary_key=True)

2
neutron/plugins/ml2/drivers/type_vxlan.py
View File

@ -53,7 +53,7 @@ class VxlanAllocation(model_base.BASEV2):
vxlan_vni = sa.Column(sa.Integer, nullable=False, primary_key=True,
autoincrement=False)
allocated = sa.Column(sa.Boolean, nullable=False, default=False,
server_default=sql.false())
server_default=sql.false(), index=True)
class VxlanEndpoints(model_base.BASEV2):