X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=3fbd2a504992bae6b9555af6a4bb56812aa7acfb;hb=3670b5f49b4d70a8eaf7ac24f50a541c9286fde2;hp=5818733ea73a565e7fe9cb3bbf876626ea576e44;hpb=9f371390bb90395b2f2f0b65c91c21047896774a;p=dak.git

diff --git a/daklib/database.py b/daklib/database.py
index 5818733e..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 <ftpmaster@debian.org>
@@ -53,8 +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 = {}
-cache_preloaded = False
 
 ################################################################################
 
@@ -389,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)
 
@@ -412,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
 
 ################################################################################
 
@@ -777,46 +758,3 @@ def get_suites(pkgname, src=False):
 
     q = projectB.query(sql)
     return map(lambda x: x[0], q.getresult())
-
-
-################################################################################
-
-def copy_temporary_contents(package, version, deb):
-    """
-    copy the previously stored contents from the temp table to the permanant one
-
-    during process-unchecked, the deb should have been scanned and the
-    contents stored in temp_content_associations
-    """
-
-    # first see if contents exist:
-
-    exists = projectB.query("""SELECT 1 FROM temp_content_associations
-                               WHERE package='%s' LIMIT 1""" % package ).getresult()
-
-    if not exists:
-        # This should NOT happen.  We should have added contents
-        # during process-unchecked.  if it did, log an error, and send
-        # an email.
-        subst = {
-            "__PACKAGE__": package,
-            "__VERSION__": version,
-            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"]
-            }
-
-        message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/bts-categorize")
-        utils.send_mail( message )
-
-        exists = DBConn().insert_content_path(package, version, deb)
-
-    if exists:
-        sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)
-                 SELECT currval('binaries_id_seq'), filepath, filename FROM temp_content_associations
-                 WHERE package='%s'
-                     AND version='%s'""" % (package, version)
-        projectB.query(sql)
-        projectB.query("""DELETE from temp_content_associations
-                          WHERE package='%s'
-                            AND version='%s'""" % (package, version))
-
-    return exists