From 88a94546e25693a515a9aae3ac48cab328c822e6 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jun 09 2020 18:43:28 +0000 Subject: avoid redundant clauses and joins Fixes https://pagure.io/koji/issue/2300 --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 2cb42cb..6991ea9 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -5373,9 +5373,6 @@ def query_buildroots(hostID=None, tagID=None, state=None, rpmID=None, archiveID= # run separate queries for picking smallest candidate set candidate_buildroot_ids = set() if rpmID is not None: - joins.insert(0, 'buildroot_listing ON buildroot.id = buildroot_listing.buildroot_id') - fields.append(('buildroot_listing.is_update', 'is_update')) - clauses.append('buildroot_listing.rpm_id = %(rpmID)i') query = QueryProcessor(columns=['buildroot_id'], tables=['buildroot_listing'], clauses=['rpm_id = %(rpmID)i'], opts={'asList': True}, values=locals()) @@ -5385,8 +5382,6 @@ def query_buildroots(hostID=None, tagID=None, state=None, rpmID=None, archiveID= return [] if archiveID is not None: - joins.insert(0, 'buildroot_archives ON buildroot.id = buildroot_archives.buildroot_id') - clauses.append('buildroot_archives.archive_id = %(archiveID)i') query = QueryProcessor(columns=['buildroot_id'], tables=['buildroot_archives'], clauses=['archive_id = %(archiveID)i'], opts={'asList': True}, values=locals()) @@ -5399,7 +5394,6 @@ def query_buildroots(hostID=None, tagID=None, state=None, rpmID=None, archiveID= return [] if taskID is not None: - clauses.append('standard_buildroot.task_id = %(taskID)i') query = QueryProcessor(columns=['buildroot_id'], tables=['standard_buildroot'], clauses=['task_id = %(taskID)i'], opts={'asList': True}, values=locals())