Fix the V22 phase 1 migrations to use new tables for mapping rather than editing existing tables

The ALTER TABLE operations previously used were causing the DB to die when run on the production TagManifest table which has 7 million rows. We instead now use new mapping tables, which is less nice, but these are temporary anyway, so hopefully we only have to deal with their ugliness for a short duration.

data/model/test/test_gc.py

@@ -11,7 +11,7 @@ from playhouse.test_utils import assert_query_count
 
 from data import model, database
 from data.database import (Image, ImageStorage, DerivedStorageForImage, Label, TagManifestLabel,
-                           ApprBlob, Manifest, TagManifest)
+                           ApprBlob, Manifest, TagManifest, TagManifestToManifest)
 from image.docker.schema1 import DockerSchema1ManifestBuilder
 from test.fixtures import *
 
@@ -162,7 +162,7 @@ def _get_dangling_label_count():
 
 def _get_dangling_manifest_count():
   manifest_ids = set([current.id for current in Manifest.select()])
-  referenced_by_tag_manifest = set([manifest.manifest_id for manifest in TagManifest.select()])
+  referenced_by_tag_manifest = set([tmt.manifest_id for tmt in TagManifestToManifest.select()])
   return len(manifest_ids - referenced_by_tag_manifest)
 
 

data/model/test/test_tag.py

@@ -9,7 +9,7 @@ from mock import patch
 
 from app import docker_v2_signing_key
 from data.database import (Image, RepositoryTag, ImageStorage, Repository, Manifest, ManifestBlob,
-                           ManifestLegacyImage)
+                           ManifestLegacyImage, TagManifestToManifest)
 from data.model.repository import create_repository
 from data.model.tag import (list_active_repo_tags, create_or_update_tag, delete_tag,
                             get_matching_tags, _tag_alive, get_matching_tags_for_images,
@@ -237,12 +237,14 @@ def test_store_tag_manifest(initialized_db):
   tag_manifest, _ = store_tag_manifest('devtable', 'simple', 'sometag', manifest)
 
   # Ensure we have the new-model expected rows.
-  assert tag_manifest.manifest is not None
-  assert tag_manifest.manifest.manifest_bytes == manifest.bytes
-  assert tag_manifest.manifest.digest == str(manifest.digest)
+  mapping_row = TagManifestToManifest.get(tag_manifest=tag_manifest)
+
+  assert mapping_row.manifest is not None
+  assert mapping_row.manifest.manifest_bytes == manifest.bytes
+  assert mapping_row.manifest.digest == str(manifest.digest)
 
   blob_rows = {m.blob_id for m in
-               ManifestBlob.select().where(ManifestBlob.manifest == tag_manifest.manifest)}
+               ManifestBlob.select().where(ManifestBlob.manifest == mapping_row.manifest)}
   assert blob_rows == {s.id for s in storages}
 
-  assert ManifestLegacyImage.get(manifest=tag_manifest.manifest).image == tag_manifest.tag.image
+  assert ManifestLegacyImage.get(manifest=mapping_row.manifest).image == tag_manifest.tag.image