From f928c7ed3df5b6a735dca9c25080958f37ce10cd Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Thu, 10 Jan 2019 06:45:28 +0000 Subject: [PATCH] Make SourcePackage.binaries a set The recent code changes made use remove from the "binaries" field in SourcePackages. Lists are not particularly optimized for this kind of removal and we have a few source packages with a lot of binary packages (e.g. libreoffice, gcc-X-cross{,-ports}) that might trip poor performance. Signed-off-by: Niels Thykier --- britney.py | 8 ++++---- britney2/inputs/suiteloader.py | 6 +++--- britney2/migration.py | 8 +++----- britney2/policies/autopkgtest.py | 3 ++- britney2/utils.py | 2 +- tests/test_policy.py | 4 ++-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/britney.py b/britney.py index 5247fc6..afd8ff1 100755 --- a/britney.py +++ b/britney.py @@ -534,7 +534,7 @@ class Britney(object): faux_section = "%s/faux" % component src_data = SourcePackage(version, sys.intern(faux_section), - [], + set(), None, True, None, @@ -565,7 +565,7 @@ class Britney(object): pkg_id, ) - src_data.binaries.append(pkg_id) + src_data.binaries.add(pkg_id) target_suite.binaries[arch][pkg_name] = bin_data pri_source_suite.binaries[arch][pkg_name] = bin_data self.all_binaries[pkg_id] = bin_data @@ -614,7 +614,7 @@ class Britney(object): pkg_list = [x.strip() for x in mandatory_field('Package-List').split("\n") if x.strip() != '' and not x.strip().startswith("#")] src_data = SourcePackage(faux_version, faux_section, - [], + set(), None, True, None, @@ -659,7 +659,7 @@ class Britney(object): False, pkg_id, ) - src_data.binaries.append(pkg_id) + src_data.binaries.add(pkg_id) target_suite.binaries[arch][pkg_name] = bin_data pri_source_suite.binaries[arch][pkg_name] = bin_data self.all_binaries[pkg_id] = bin_data diff --git a/britney2/inputs/suiteloader.py b/britney2/inputs/suiteloader.py index 62a56c6..1a9dc40 100644 --- a/britney2/inputs/suiteloader.py +++ b/britney2/inputs/suiteloader.py @@ -226,7 +226,7 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader): # stop-gap relies on the packages files being sorted by name # and the version, so it is not particularly resilient. if pkg_id not in old_src_binaries: - old_src_binaries.append(pkg_id) + old_src_binaries.add(pkg_id) # Merge Pre-Depends with Depends and Conflicts with # Breaks. Britney is not interested in the "finer @@ -280,10 +280,10 @@ class DebMirrorLikeSuiteContentLoader(SuiteContentLoader): # of the versions we include as only the package name and # architecture are recorded. if pkg_id not in srcdist[source].binaries: - srcdist[source].binaries.append(pkg_id) + srcdist[source].binaries.add(pkg_id) # if the source package doesn't exist, create a fake one else: - srcdist[source] = SourcePackage(source_version, 'faux', [pkg_id], None, True, None, None, [], []) + srcdist[source] = SourcePackage(source_version, 'faux', {pkg_id}, None, True, None, None, [], []) # add the resulting dictionary to the package list packages[pkg] = dpkg diff --git a/britney2/migration.py b/britney2/migration.py index 085cd75..5eca167 100644 --- a/britney2/migration.py +++ b/britney2/migration.py @@ -259,7 +259,7 @@ class MigrationManager(object): # always create a new list of binaries sources_t[source_name].binaries = copy.copy(old_source.binaries) else: - sources_t[source_name].binaries = list() + sources_t[source_name].binaries = set() undo['sources'][source_name] = old_source @@ -291,8 +291,7 @@ class MigrationManager(object): del provides_t_a[provided_pkg] # for source removal, the source is already gone if source_name in sources_t: - if rm_pkg_id in sources_t[source_name].binaries: - sources_t[source_name].binaries.remove(rm_pkg_id) + sources_t[source_name].binaries.discard(rm_pkg_id) # finally, remove the binary package del binaries_t_a[binary] target_suite.remove_binary(rm_pkg_id) @@ -346,8 +345,7 @@ class MigrationManager(object): target_suite.add_binary(updated_pkg_id) updated_binaries.add(updated_pkg_id) # add the binary to the source package - if updated_pkg_id not in sources_t[source_name].binaries: - sources_t[source_name].binaries.append(updated_pkg_id) + sources_t[source_name].binaries.add(updated_pkg_id) # register new provided packages for provided_pkg, prov_version, _ in new_pkg_data.provides: key = (provided_pkg, parch) diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index 5a5244f..26f6480 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -22,6 +22,7 @@ import os import json import tarfile import io +import itertools import re import sys import urllib.parse @@ -577,7 +578,7 @@ class AutopkgtestPolicy(BasePolicy): pkg_universe = self.britney.pkg_universe # plus all direct reverse dependencies and test triggers of its # binaries which have an autopkgtest - for binary in srcinfo.binaries + extra_bins: + for binary in itertools.chain(srcinfo.binaries, extra_bins): rdeps = pkg_universe.reverse_dependencies_of(binary) for rdep in rdeps: try: diff --git a/britney2/utils.py b/britney2/utils.py index 21f9cbf..e016f62 100644 --- a/britney2/utils.py +++ b/britney2/utils.py @@ -617,7 +617,7 @@ def read_sources_file(filename, sources=None, intern=sys.intern): build_deps_indep = sys.intern(build_deps_indep) sources[intern(pkg)] = SourcePackage(intern(ver), section, - [], + set(), maint, False, build_deps_arch, diff --git a/tests/test_policy.py b/tests/test_policy.py index c7e892e..6b0a66f 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -60,7 +60,7 @@ def create_excuse(name): def create_source_package(version, section='devel', binaries=None): if binaries is None: - binaries = [] + binaries = set() return SourcePackage(version, section, binaries, 'Random tester', False, None, None, ['autopkgtest'], []) @@ -122,7 +122,7 @@ def build_sources_from_universe_and_inst_tester(policy, pkg_universe, inst_teste binaries_s = {} for pkg_id in pkg_universe: pkg_name = pkg_id.package_name - src_universe[pkg_id] = create_source_package(pkg_id.version, binaries=[pkg_id]) + src_universe[pkg_id] = create_source_package(pkg_id.version, binaries={pkg_id}) bin_universe[pkg_id] = create_bin_package(pkg_id) if inst_tester.is_pkg_in_the_suite(pkg_id): if pkg_name in suite_info.target_suite.sources: