openstack/glance
Code Issues Proposed changes

Sql query optimization for image detail

Browse Source 
Current the image detail call uses left outer joins
for its queries, which makes it neglect the index on the
images table. The approach used in this patch, splits up
the querying into two parts and then does the join,
so that we can make use of the index

Change-Id: I65df0be5f156959c1e70ad9cb1a8b7eceebb4d8a
This commit is contained in:
iccha-sethi 2013-06-10 14:22:11 +00:00
parent 2c734559b3
commit 4df82ebd05
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
glance/db/sqlalchemy/api.py
View File

@ -534,29 +534,30 @@ def image_get_all(context, filters=None, marker=None, limit=None,
filters = filters or {}
session = _get_session()
query = session.query(models.Image)\
.options(sa_orm.joinedload(models.Image.properties))\
.options(sa_orm.joinedload(models.Image.locations))
query_image = session.query(models.Image)
query_member = session.query(models.Image).join(models.Image.members)
if not context.is_admin:
visibility_filters = [models.Image.is_public == True]
member_filters = [models.ImageMember.deleted == False]
if context.owner is not None:
if member_status == 'all':
visibility_filters.extend([
models.Image.owner == context.owner,
models.Image.members.any(member=context.owner,
deleted=False),
])
models.Image.owner == context.owner])
member_filters.extend([
models.ImageMember.member == context.owner])
else:
visibility_filters.extend([
models.Image.owner == context.owner,
models.Image.members.any(member=context.owner,
deleted=False,
status=member_status),
])
models.Image.owner == context.owner])
member_filters.extend([
models.ImageMember.member == context.owner,
models.ImageMember.status == member_status])
query = query.filter(sa_sql.or_(*visibility_filters))
query_image = query_image.filter(sa_sql.or_(*visibility_filters))
query_member = query_member.filter(sa_sql.and_(*member_filters))
query = query_image.union(query_member)
if 'visibility' in filters:
visibility = filters.pop('visibility')
@ -568,9 +569,10 @@ def image_get_all(context, filters=None, marker=None, limit=None,
query = query.filter(
models.Image.owner == context.owner)
else:
query = query.filter(
models.Image.members.any(member=context.owner,
deleted=False))
query_member = query_member.filter(
models.ImageMember.member == context.owner,
models.ImageMember.deleted == False)
query = query_member
if is_public is not None:
query = query.filter(models.Image.is_public == is_public)
@ -634,6 +636,9 @@ def image_get_all(context, filters=None, marker=None, limit=None,
marker=marker_image,
sort_dir=sort_dir)
query = query.options(sa_orm.joinedload(models.Image.properties))\
.options(sa_orm.joinedload(models.Image.locations))
return [_normalize_locations(image.to_dict()) for image in query.all()]