Merge pull request #3234 from quay/joseph.schorr/QUAY-1030/interfacing-part-8

Change verbs endpoint to use the new registry data model interface

data/model/blob.py

@@ -7,6 +7,23 @@ from data.database import (Repository, Namespace, ImageStorage, Image, ImageStor
                            BlobUpload, ImageStorageLocation, db_random_func)
 
 
+def get_repository_blob_by_digest(repository, blob_digest):
+  """ Find the content-addressable blob linked to the specified repository.
+  """
+  try:
+    storage_id_query = (ImageStorage
+                        .select(ImageStorage.id)
+                        .join(Image)
+                        .where(Image.repository == repository,
+                               ImageStorage.content_checksum == blob_digest,
+                               ImageStorage.uploading == False)
+                        .limit(1))
+
+    return storage_model.get_storage_by_subquery(storage_id_query)
+  except InvalidImageException:
+    raise BlobDoesNotExist('Blob does not exist with digest: {0}'.format(blob_digest))
+
+
 def get_repo_blob_by_digest(namespace, repo_name, blob_digest):
   """ Find the content-addressable blob linked to the specified repository.
   """

data/model/image.py

@@ -489,44 +489,33 @@ def find_or_create_derived_storage(source_image, transformation_name, preferred_
   new_storage = storage.create_v1_storage(preferred_location)
 
   try:
-    DerivedStorageForImage.create(source_image=source_image, derivative=new_storage,
-                                  transformation=trans, uniqueness_hash=uniqueness_hash)
+    derived = DerivedStorageForImage.create(source_image=source_image, derivative=new_storage,
+                                            transformation=trans, uniqueness_hash=uniqueness_hash)
   except IntegrityError:
     # Storage was created while this method executed. Just return the existing.
     new_storage.delete_instance(recursive=True)
     return find_derived_storage_for_image(source_image, transformation_name, varying_metadata)
 
-  return new_storage
+  return derived
 
 
 def find_derived_storage_for_image(source_image, transformation_name, varying_metadata=None):
   uniqueness_hash = _get_uniqueness_hash(varying_metadata)
 
   try:
-    found = (ImageStorage
+    found = (DerivedStorageForImage
              .select(ImageStorage, DerivedStorageForImage)
-             .join(DerivedStorageForImage)
+             .join(ImageStorage)
+             .switch(DerivedStorageForImage)
              .join(ImageStorageTransformation)
              .where(DerivedStorageForImage.source_image == source_image,
                     ImageStorageTransformation.name == transformation_name,
                     DerivedStorageForImage.uniqueness_hash == uniqueness_hash)
              .get())
-
-    found.locations = {placement.location.name for placement in found.imagestorageplacement_set}
     return found
-  except ImageStorage.DoesNotExist:
+  except DerivedStorageForImage.DoesNotExist:
     return None
 
 
-def delete_derived_storage_by_uuid(storage_uuid):
-  try:
-    image_storage = storage.get_storage_by_uuid(storage_uuid)
-  except InvalidImageException:
-    return
-
-  try:
-    DerivedStorageForImage.get(derivative=image_storage)
-  except DerivedStorageForImage.DoesNotExist:
-    return
-
-  image_storage.delete_instance(recursive=True)
+def delete_derived_storage(derived_storage):
+  derived_storage.derivative.delete_instance(recursive=True)

data/model/storage.py

@@ -254,6 +254,7 @@ def get_storage_by_uuid(storage_uuid):
 
 def get_layer_path(storage_record):
   """ Returns the path in the storage engine to the layer data referenced by the storage row. """
+  assert storage_record.cas_path is not None
   return get_layer_path_for_storage(storage_record.uuid, storage_record.cas_path,
                                     storage_record.content_checksum)
 
@@ -280,7 +281,8 @@ def lookup_repo_storages_by_content_checksum(repo, checksums):
     query_alias = 'q{0}'.format(counter)
     candidate_subq = (ImageStorage
                       .select(ImageStorage.id, ImageStorage.content_checksum,
-                              ImageStorage.image_size, ImageStorage.uuid)
+                              ImageStorage.image_size, ImageStorage.uuid, ImageStorage.cas_path,
+                              ImageStorage.uncompressed_size)
                       .join(Image)
                       .where(Image.repository == repo, ImageStorage.content_checksum == checksum)
                       .limit(1)
@@ -336,7 +338,7 @@ def get_storage_locations(uuid):
 
 def save_torrent_info(storage_object, piece_length, pieces):
   try:
-    TorrentInfo.create(storage=storage_object, piece_length=piece_length, pieces=pieces)
+    return TorrentInfo.create(storage=storage_object, piece_length=piece_length, pieces=pieces)
   except IntegrityError:
     # TorrentInfo already exists for this storage.
     pass