openstack
/
neutron
Code Issues Proposed changes

Merge "Use SQL IN clause instead of OR with exact match comparisons"

This commit is contained in:
Zuul 2022-06-14 16:49:11 +00:00 committed by Gerrit Code Review
parent fab415cfe2 a1d135e3c0
commit db93cc5555
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/objects/l3agent.py
View File

@ -13,7 +13,6 @@
from neutron_lib.db import api as db_api from neutron_lib.db import api as db_api
from neutron_lib.objects import common_types from neutron_lib.objects import common_types
from oslo_versionedobjects import fields as obj_fields from oslo_versionedobjects import fields as obj_fields
import sqlalchemy as sa
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload
from sqlalchemy import sql from sqlalchemy import sql
@ -61,9 +60,8 @@ class RouterL3AgentBinding(base.NeutronDbObject):
l3_attrs.RouterExtraAttributes, l3_attrs.RouterExtraAttributes,
l3_attrs.RouterExtraAttributes.router_id == l3_attrs.RouterExtraAttributes.router_id ==
l3agent.RouterL3AgentBinding.router_id).filter( l3agent.RouterL3AgentBinding.router_id).filter(
sa.or_( l3_attrs.RouterExtraAttributes.ha.in_([sql.false(),
l3_attrs.RouterExtraAttributes.ha == sql.false(), sql.null()])))
l3_attrs.RouterExtraAttributes.ha == sql.null())))
bindings = [cls._load_object(context, db_obj) for db_obj in bindings = [cls._load_object(context, db_obj) for db_obj in
query.all()] query.all()]
return bindings return bindings