vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove inner query for ancestors lookup on get_matching_tags

Browse source
This commit is contained in:
Joseph Schorr 2017-04-28 20:10:54 -04:00
parent 8b2e4d3bcf
commit e583be3914
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
data/model/image.py
View file

@ -17,23 +17,18 @@ from util.canonicaljson import canonicalize
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def get_repository_image_and_deriving(docker_image_id, storage_uuid): def get_image_with_storage(docker_image_id, storage_uuid):
""" Returns all matching images with the given docker image ID and storage uuid, along with any """ Returns the image with the given docker image ID and storage uuid or None if none.
images which have the image ID as parents.
""" """
try: try:
image_found = (Image return (Image
.select() .select()
.join(ImageStorage) .join(ImageStorage)
.where(Image.docker_image_id == docker_image_id, .where(Image.docker_image_id == docker_image_id,
ImageStorage.uuid == storage_uuid) ImageStorage.uuid == storage_uuid)
.get()) .get())
except Image.DoesNotExist: except Image.DoesNotExist:
return Image.select().where(Image.id < 0) # Empty query return None
ancestors_pattern = '%s%s/%%' % (image_found.ancestors, image_found.id)
return Image.select().where((Image.ancestors ** ancestors_pattern) |
(Image.id == image_found.id))
def get_parent_images_with_placements(namespace_name, repository_name, image_obj): def get_parent_images_with_placements(namespace_name, repository_name, image_obj):

9
data/model/tag.py
View file

@ -56,14 +56,19 @@ def _tag_alive(query, now_ts=None):
def get_matching_tags(docker_image_id, storage_uuid, *args): def get_matching_tags(docker_image_id, storage_uuid, *args):
""" Returns a query pointing to all tags that contain the image with the """ Returns a query pointing to all tags that contain the image with the
given docker_image_id and storage_uuid. """ given docker_image_id and storage_uuid. """
image_query = image.get_repository_image_and_deriving(docker_image_id, storage_uuid) image_row = image.get_image_with_storage(docker_image_id, storage_uuid)
if image_row is None:
return RepositoryTag.select().where(RepositoryTag.id < 0) # Empty query.
ancestors_str = '%s%s/%%' % (image_row.ancestors, image_row.id)
return _tag_alive(RepositoryTag return _tag_alive(RepositoryTag
.select(*args) .select(*args)
.distinct() .distinct()
.join(Image) .join(Image)
.join(ImageStorage) .join(ImageStorage)
.where(Image.id << image_query, RepositoryTag.hidden == False)) .where(RepositoryTag.hidden == False)
.where((Image.id == image_row.id) |
(Image.ancestors ** ancestors_str)))
def get_tags_for_image(image_id, *args): def get_tags_for_image(image_id, *args):