Phase 1 of migrating APPR-specific tables to tables with the Appr prefix

Fixes https://jira.coreos.com/browse/QUAY-950

data/model/repository.py

@@ -10,7 +10,7 @@ from cachetools import ttl_cache
 from data.model import (
   config, DataModelException, tag, db_transaction, storage, permission, _basequery)
 from data.database import (
-  Repository, Namespace, RepositoryTag, Star, Image, ImageStorage, User, Visibility, Tag,
+  Repository, Namespace, RepositoryTag, Star, Image, ImageStorage, User, Visibility, Tag, ApprTag,
   RepositoryPermission, RepositoryActionCount, Role, RepositoryAuthorizedEmail, TagManifest,
   DerivedStorageForImage, Label, TagManifestLabel, db_for_update, get_epoch_timestamp,
   db_random_func, db_concat_func, RepositorySearchScore, RepositoryKind)
@@ -87,11 +87,13 @@ def purge_repository(namespace_name, repository_name):
   except Repository.DoesNotExist:
     return False
 
-  # Delete the repository of all OCI-referenced entries.
+  # Delete the repository of all Appr-referenced entries.
   # Note that new-model Tag's must be deleted in *two* passes, as they can reference parent tags,
   # and MySQL is... particular... about such relationships when deleting.
   Tag.delete().where(Tag.repository == repo, ~(Tag.linked_tag >> None)).execute()
   Tag.delete().where(Tag.repository == repo).execute()
+  ApprTag.delete().where(ApprTag.repository == repo, ~(ApprTag.linked_tag >> None)).execute()
+  ApprTag.delete().where(ApprTag.repository == repo).execute()
 
   # Delete all tags to allow gc to reclaim storage
   previously_referenced = tag.purge_all_tags(repo)

data/model/sqlalchemybridge.py

@@ -15,7 +15,6 @@ OPTION_TRANSLATIONS = {
   'null': 'nullable',
 }
 
-
 def gen_sqlalchemy_metadata(peewee_model_list):
   metadata = MetaData(naming_convention={
     "ix": 'ix_%(column_0_label)s',

data/model/storage.py

@@ -9,7 +9,7 @@ from data.model import (config, db_transaction, InvalidImageException, TorrentIn
 from data.database import (ImageStorage, Image, ImageStoragePlacement, ImageStorageLocation,
                            ImageStorageTransformation, ImageStorageSignature,
                            ImageStorageSignatureKind, Repository, Namespace, TorrentInfo, Blob,
-                           ensure_under_transaction)
+                           ApprBlob, ensure_under_transaction)
 
 
 logger = logging.getLogger(__name__)
@@ -105,15 +105,21 @@ def garbage_collect_storage(storage_id_whitelist):
           logger.warning('GC attempted to remove CAS checksums %s, which are still IS referenced',
                          is_referenced_checksums)
 
-        # Check the new Blob table as well.
+        # Check the ApprBlob tables as well.
         query = Blob.select(Blob.digest).where(Blob.digest << list(content_checksums))
         blob_referenced_checksums = set([blob.digest for blob in query])
         if blob_referenced_checksums:
           logger.warning('GC attempted to remove CAS checksums %s, which are still Blob referenced',
                          blob_referenced_checksums)
 
+        query = ApprBlob.select(ApprBlob.digest).where(ApprBlob.digest << list(content_checksums))
+        appr_blob_referenced_checksums = set([blob.digest for blob in query])
+        if appr_blob_referenced_checksums:
+          logger.warning('GC attempted to remove CAS checksums %s, which are ApprBlob referenced',
+                         appr_blob_referenced_checksums)
+
         unreferenced_checksums = (content_checksums - blob_referenced_checksums -
-                                  is_referenced_checksums)
+                                  appr_blob_referenced_checksums - is_referenced_checksums)
 
       # Return all placements for all image storages found not at a CAS path or with a content
       # checksum that is referenced.

data/model/test/test_gc.py

@@ -9,7 +9,8 @@ from contextlib import contextmanager
 from playhouse.test_utils import assert_query_count
 
 from data import model, database
-from data.database import Image, ImageStorage, DerivedStorageForImage, Label, TagManifestLabel, Blob
+from data.database import (Image, ImageStorage, DerivedStorageForImage, Label, TagManifestLabel,
+                           Blob, ApprBlob)
 from test.fixtures import *
 
 
@@ -187,7 +188,10 @@ def assert_gc_integrity(expect_storage_removed=True):
       storage.get_content({preferred}, storage.blob_path(storage_row.content_checksum))
 
   for blob_row in Blob.select():
-      storage.get_content({preferred}, storage.blob_path(blob_row.digest))
+    storage.get_content({preferred}, storage.blob_path(blob_row.digest))
+
+  for blob_row in ApprBlob.select():
+    storage.get_content({preferred}, storage.blob_path(blob_row.digest))
 
 
 def test_has_garbage(default_tag_policy, initialized_db):
@@ -589,6 +593,7 @@ def test_images_shared_cas_with_new_blob_table(default_tag_policy, initialized_d
 
     is1 = database.ImageStorage.create(content_checksum=digest, uploading=False)
     database.Blob.create(digest=digest, size=0, media_type=media_type)
+    database.ApprBlob.create(digest=digest, size=0, media_type=media_type)
 
     location = database.ImageStorageLocation.get(name=preferred)
     database.ImageStoragePlacement.create(location=location, storage=is1)