X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=3fbd2a504992bae6b9555af6a4bb56812aa7acfb;hb=ba2b82d3c453ec3d2ce3e6a91a994b6e4ba51ef3;hp=3cbb67b7e57b7b9e4ffca2035900af4aaced35dc;hpb=cd5b29ddfd8de263c085f494b9573d683913f6f3;p=dak.git diff --git a/daklib/database.py b/daklib/database.py index 3cbb67b7..3fbd2a50 100755 --- a/daklib/database.py +++ b/daklib/database.py @@ -3,7 +3,8 @@ """ DB access functions @group readonly: get_suite_id, get_section_id, get_priority_id, get_override_type_id, get_architecture_id, get_archive_id, get_component_id, get_location_id, - get_source_id, get_suite_version, get_files_id, get_maintainer, get_suites + get_source_id, get_suite_version, get_files_id, get_maintainer, get_suites, + get_suite_architectures @group read/write: get_or_set*, set_files_id @contact: Debian FTP Master @@ -53,11 +54,6 @@ fingerprint_id_cache = {} #: cache for fingerprints queue_id_cache = {} #: cache for queues uid_id_cache = {} #: cache for uids suite_version_cache = {} #: cache for suite_versions (packages) -suite_bin_version_cache = {} -content_path_id_cache = {} -content_file_id_cache = {} -insert_contents_file_cache = {} -cache_preloaded = False ################################################################################ @@ -392,7 +388,6 @@ def get_suite_version(source, suite): @return: the version for I{source} in I{suite} """ - global suite_version_cache cache_key = "%s_%s" % (source, suite) @@ -415,49 +410,32 @@ def get_suite_version(source, suite): return version -def get_latest_binary_version_id(binary, section, suite, arch): - global suite_bin_version_cache - cache_key = "%s_%s_%s_%s" % (binary, section, suite, arch) - cache_key_all = "%s_%s_%s_%s" % (binary, section, suite, get_architecture_id("all")) - - # Check for the cache hit for its arch, then arch all - if suite_bin_version_cache.has_key(cache_key): - return suite_bin_version_cache[cache_key] - if suite_bin_version_cache.has_key(cache_key_all): - return suite_bin_version_cache[cache_key_all] - if cache_preloaded == True: - return # package does not exist - - q = projectB.query("SELECT DISTINCT b.id FROM binaries b JOIN bin_associations ba ON (b.id = ba.bin) JOIN override o ON (o.package=b.package) WHERE b.package = '%s' AND b.architecture = '%d' AND ba.suite = '%d' AND o.section = '%d'" % (binary, int(arch), int(suite), int(section))) - - if not q.getresult(): - return False - - highest_bid = q.getresult()[0][0] - - suite_bin_version_cache[cache_key] = highest_bid - return highest_bid +def get_suite_architectures(suite): + """ + Returns list of architectures for C{suite}. -def preload_binary_id_cache(): - global suite_bin_version_cache, cache_preloaded + @type suite: string, int + @param suite: the suite name or the suite_id - # Get suite info - q = projectB.query("SELECT id FROM suite") - suites = q.getresult() + @rtype: list + @return: the list of architectures for I{suite} + """ - # Get arch mappings - q = projectB.query("SELECT id FROM architecture") - arches = q.getresult() + suite_id = None + if type(suite) == str: + suite_id = get_suite_id(suite) + elif type(suite) == int: + suite_id = suite + else: + return None - for suite in suites: - for arch in arches: - q = projectB.query("SELECT DISTINCT b.id, b.package, o.section FROM binaries b JOIN bin_associations ba ON (b.id = ba.bin) JOIN override o ON (o.package=b.package) WHERE b.architecture = '%d' AND ba.suite = '%d'" % (int(arch[0]), int(suite[0]))) + sql = """ SELECT a.arch_string FROM suite_architectures sa + JOIN architecture a ON (a.id = sa.architecture) + WHERE suite='%s' """ % (suite_id) - for bi in q.getresult(): - cache_key = "%s_%s_%s_%s" % (bi[1], bi[2], suite[0], arch[0]) - suite_bin_version_cache[cache_key] = int(bi[0]) + q = projectB.query(sql) + return map(lambda x: x[0], q.getresult()) - cache_preloaded = True ################################################################################ @@ -780,59 +758,3 @@ def get_suites(pkgname, src=False): q = projectB.query(sql) return map(lambda x: x[0], q.getresult()) - -################################################################################ - -def get_or_set_contents_file_id(file): - global content_file_id_cache - - if not content_file_id_cache.has_key(file): - sql_select = "SELECT id FROM content_file_names WHERE file = '%s'" % file - q = projectB.query(sql_select) - if not q.getresult(): - # since this can be called within a transaction, we can't use currval - q = projectB.query("INSERT INTO content_file_names VALUES (DEFAULT, '%s') RETURNING id" % (file)) - content_file_id_cache[file] = int(q.getresult()[0][0]) - return content_file_id_cache[file] - -################################################################################ - -def get_or_set_contents_path_id(path): - global content_path_id_cache - - if not content_path_id_cache.has_key(path): - sql_select = "SELECT id FROM content_file_paths WHERE path = '%s'" % path - q = projectB.query(sql_select) - if not q.getresult(): - # since this can be called within a transaction, we can't use currval - q = projectB.query("INSERT INTO content_file_paths VALUES (DEFAULT, '%s') RETURNING id" % (path)) - content_path_id_cache[path] = int(q.getresult()[0][0]) - return content_path_id_cache[path] - -################################################################################ - -def insert_content_path(bin_id, fullpath): - global insert_contents_file_cache - cache_key = "%s_%s" % (bin_id, fullpath) - - # have we seen this contents before? - # probably only revelant during package import - if insert_contents_file_cache.has_key(cache_key): - return - - # split the path into basename, and pathname - (path, file) = os.path.split(fullpath) - - # Get the necessary IDs ... - file_id = get_or_set_contents_file_id(file) - path_id = get_or_set_contents_path_id(path) - - # Determine if we're inserting a duplicate row - q = projectB.query("SELECT 1 FROM content_associations WHERE binary_pkg = '%d' AND filepath = '%d' AND filename = '%d'" % (int(bin_id), path_id, file_id)) - if q.getresult(): - # Yes we are, return without doing the insert - return - - # Put them into content_assiocations - projectB.query("INSERT INTO content_associations VALUES (DEFAULT, '%d', '%d', '%d')" % (bin_id, path_id, file_id)) - return