openstack
/
neutron
Code Issues Proposed changes

Merge "Get rid of double-join to rbac_entries without filter"

This commit is contained in:
Jenkins 2016-10-08 18:18:24 +00:00 committed by Gerrit Code Review
parent 838f331bd3 145dbaab21
commit fcd47cca6e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/db/common_db_mixin.py
View File

@ -222,7 +222,6 @@ class CommonDbMixin(object):
elif key == 'shared' and hasattr(model, 'rbac_entries'):
# translate a filter on shared into a query against the
# object's rbac entries
query = query.outerjoin(model.rbac_entries)
rbac = model.rbac_entries.property.mapper.class_
matches = [rbac.target_tenant == '*']
if context:
@ -249,6 +248,12 @@ class CommonDbMixin(object):
query.session.query(rbac.object_id).
filter(is_shared)
)
elif (not context or
not self.model_query_scope(context, model)):
# we only want to join if we aren't using the subquery
# and if we aren't already joined because this is a
# scoped query
query = query.outerjoin(model.rbac_entries)
query = query.filter(is_shared)
for _nam, hooks in six.iteritems(self._model_query_hooks.get(model,
{})):