openstack/glance
Code Issues Proposed changes

Merge "Sql query optimization for image detail"

Browse Source
This commit is contained in:
Jenkins 2013-06-11 15:19:37 +00:00 committed by Gerrit Code Review
commit aae7252711
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 {} filters = filters or {}
session = _get_session() session = _get_session()
query = session.query(models.Image)\ query_image = session.query(models.Image)
.options(sa_orm.joinedload(models.Image.properties))\ query_member = session.query(models.Image).join(models.Image.members)
.options(sa_orm.joinedload(models.Image.locations))
if not context.is_admin: if not context.is_admin:
visibility_filters = [models.Image.is_public == True] visibility_filters = [models.Image.is_public == True]
member_filters = [models.ImageMember.deleted == False]
if context.owner is not None: if context.owner is not None:
if member_status == 'all': if member_status == 'all':
visibility_filters.extend([ visibility_filters.extend([
models.Image.owner == context.owner, models.Image.owner == context.owner])
models.Image.members.any(member=context.owner, member_filters.extend([
deleted=False), models.ImageMember.member == context.owner])
])
else: else:
visibility_filters.extend([ visibility_filters.extend([
models.Image.owner == context.owner, models.Image.owner == context.owner])
models.Image.members.any(member=context.owner, member_filters.extend([
deleted=False, models.ImageMember.member == context.owner,
status=member_status), 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: if 'visibility' in filters:
visibility = filters.pop('visibility') visibility = filters.pop('visibility')
@ -568,9 +569,10 @@ def image_get_all(context, filters=None, marker=None, limit=None,
query = query.filter( query = query.filter(
models.Image.owner == context.owner) models.Image.owner == context.owner)
else: else:
query = query.filter( query_member = query_member.filter(
models.Image.members.any(member=context.owner, models.ImageMember.member == context.owner,
deleted=False)) models.ImageMember.deleted == False)
query = query_member
if is_public is not None: if is_public is not None:
query = query.filter(models.Image.is_public == is_public) 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, marker=marker_image,
sort_dir=sort_dir) 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()] return [_normalize_locations(image.to_dict()) for image in query.all()]