From 030c69d7d295eb96ea10074483edd9da60ba4e32 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 12 Nov 2015 21:59:52 -0500 Subject: [PATCH] Further merge fixes --- data/database.py | 4 ---- initdb.py | 4 ---- workers/securityworker.py | 42 ++++++++++++++++++++------------------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/data/database.py b/data/database.py index d1431eeed..00735b49b 100644 --- a/data/database.py +++ b/data/database.py @@ -576,10 +576,6 @@ class Image(BaseModel): security_indexed_engine = IntegerField(default=-1) parent_id = IntegerField(index=True, null=True) - security_indexed = BooleanField(default=False) - security_indexed_engine = IntegerField(default=-1) - parent = ForeignKeyField('self', index=True, null=True, related_name='children') - class Meta: database = db read_slaves = (read_slave,) diff --git a/initdb.py b/initdb.py index de97ec691..ce51c1749 100644 --- a/initdb.py +++ b/initdb.py @@ -99,10 +99,6 @@ def __create_subtree(repo, structure, creator_username, parent, tag_map): new_image.security_indexed_engine = -1 new_image.save() - new_image.security_indexed = False - new_image.security_indexed_engine = maxsize - new_image.save() - creation_time = REFERENCE_DATE + timedelta(weeks=image_num) + timedelta(days=model_num) command_list = SAMPLE_CMDS[image_num % len(SAMPLE_CMDS)] command = json.dumps(command_list) if command_list else None diff --git a/workers/securityworker.py b/workers/securityworker.py index 7989821ed..11492fbf2 100644 --- a/workers/securityworker.py +++ b/workers/securityworker.py @@ -31,14 +31,13 @@ def _get_images_to_export_list(version): # Collect the images without parents candidates = (Image - .select(Image.docker_image_id, ImageStorage.uuid, ImageStorage.checksum) - .join(ImageStorage) - .where(Image.security_indexed_engine < version, - Image.parent_id >> None, - ImageStorage.uploading == False, - ImageStorage.checksum != '') - .limit(BATCH_SIZE*10) - .alias('candidates')) + .select(Image.id, Image.docker_image_id, ImageStorage.uuid) + .join(ImageStorage) + .where(Image.security_indexed_engine < version, + Image.parent_id >> None, + ImageStorage.uploading == False) + .limit(BATCH_SIZE*10) + .alias('candidates')) images = (Image .select(candidates.c.id, candidates.c.docker_image_id, candidates.c.uuid) @@ -56,18 +55,21 @@ def _get_images_to_export_list(version): # Collect the images with analyzed parents. candidates = (Image - .select(Image.docker_image_id, ImageStorage.uuid, ImageStorage.checksum, Parent.docker_image_id.alias('parent_docker_image_id'), ParentImageStorage.uuid.alias('parent_storage_uuid')) - .join(Parent, on=(Image.parent_id == Parent.id)) - .join(ParentImageStorage, on=(ParentImageStorage.id == Parent.storage)) - .switch(Image) - .join(ImageStorage) - .where(Image.security_indexed_engine < version, - Parent.security_indexed == True, - Parent.security_indexed_engine >= version, - ImageStorage.uploading == False, - ImageStorage.checksum != '') - .limit(BATCH_SIZE*10) - .alias('candidates')) + .select(Image.id, + Image.docker_image_id, + ImageStorage.uuid, + Parent.docker_image_id.alias('parent_docker_image_id'), + ParentImageStorage.uuid.alias('parent_storage_uuid')) + .join(Parent, on=(Image.parent_id == Parent.id)) + .join(ParentImageStorage, on=(ParentImageStorage.id == Parent.storage)) + .switch(Image) + .join(ImageStorage) + .where(Image.security_indexed_engine < version, + Parent.security_indexed == True, + Parent.security_indexed_engine >= version, + ImageStorage.uploading == False) + .limit(BATCH_SIZE*10) + .alias('candidates')) images = (Image .select(candidates.c.id,