X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=d886a2d841080fba93f93601d131c6eaeb9cdc05;hb=41b58850cb71d3fa204810b19cb0e00a46992fdb;hp=8760d91bbd475f801281dabb8e7d29f00ebaa27b;hpb=bb8283ad6274e461fc78a00b2a52c6594c53e13d;p=dak.git

diff --git a/db_access.py b/db_access.py
index 8760d91b..d886a2d8 100644
--- a/db_access.py
+++ b/db_access.py
@@ -1,6 +1,8 @@
+#!/usr/bin/env python
+
 # DB access fucntions
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: db_access.py,v 1.3 2000-12-05 04:27:48 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: db_access.py,v 1.16 2004-06-17 15:00:41 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,26 +18,53 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import pg, string
+################################################################################
+
+import sys, time, types;
+
+################################################################################
+
+Cnf = None;
+projectB = None;
+suite_id_cache = {};
+section_id_cache = {};
+priority_id_cache = {};
+override_type_id_cache = {};
+architecture_id_cache = {};
+archive_id_cache = {};
+component_id_cache = {};
+location_id_cache = {};
+maintainer_id_cache = {};
+source_id_cache = {};
+files_id_cache = {};
+maintainer_cache = {};
+fingerprint_id_cache = {};
+uid_id_cache = {};
 
-Cnf = None
-projectB = None
-suite_id_cache = {}
-architecture_id_cache = {}
-archive_id_cache = {}
-component_id_cache = {}
-location_id_cache = {}
-maintainer_id_cache = {}
-source_id_cache = {}
-files_id_cache = {}
+################################################################################
 
 def init (config, sql):
     global Cnf, projectB
-    
+
     Cnf = config;
     projectB = sql;
 
-############################################################################################
+
+def do_query(q):
+    sys.stderr.write("query: \"%s\" ... " % (q));
+    before = time.time();
+    r = projectB.query(q);
+    time_diff = time.time()-before;
+    sys.stderr.write("took %.3f seconds.\n" % (time_diff));
+    if type(r) is int:
+        sys.stderr.write("int result: %s\n" % (r));
+    elif type(r) is types.NoneType:
+        sys.stderr.write("result: None\n");
+    else:
+        sys.stderr.write("pgresult: %s\n" % (r.getresult()));
+    return r;
+
+################################################################################
 
 def get_suite_id (suite):
     global suite_id_cache
@@ -45,34 +74,92 @@ def get_suite_id (suite):
 
     q = projectB.query("SELECT id FROM suite WHERE suite_name = '%s'" % (suite))
     ql = q.getresult();
-    if ql == []:
-        return -1; 
-    
-    suite_id = q.getresult()[0][0]
+    if not ql:
+        return -1;
+
+    suite_id = ql[0][0];
     suite_id_cache[suite] = suite_id
 
     return suite_id
 
+def get_section_id (section):
+    global section_id_cache
+
+    if section_id_cache.has_key(section):
+        return section_id_cache[section]
+
+    q = projectB.query("SELECT id FROM section WHERE section = '%s'" % (section))
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    section_id = ql[0][0];
+    section_id_cache[section] = section_id
+
+    return section_id
+
+def get_priority_id (priority):
+    global priority_id_cache
+
+    if priority_id_cache.has_key(priority):
+        return priority_id_cache[priority]
+
+    q = projectB.query("SELECT id FROM priority WHERE priority = '%s'" % (priority))
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    priority_id = ql[0][0];
+    priority_id_cache[priority] = priority_id
+
+    return priority_id
+
+def get_override_type_id (type):
+    global override_type_id_cache;
+
+    if override_type_id_cache.has_key(type):
+        return override_type_id_cache[type];
+
+    q = projectB.query("SELECT id FROM override_type WHERE type = '%s'" % (type));
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    override_type_id = ql[0][0];
+    override_type_id_cache[type] = override_type_id;
+
+    return override_type_id;
+
 def get_architecture_id (architecture):
-    global architecture_id_cache
+    global architecture_id_cache;
 
     if architecture_id_cache.has_key(architecture):
-        return architecture_id_cache[architecture]
+        return architecture_id_cache[architecture];
 
     q = projectB.query("SELECT id FROM architecture WHERE arch_string = '%s'" % (architecture))
-    architecture_id = q.getresult()[0][0]
-    architecture_id_cache[architecture] = architecture_id
+    ql = q.getresult();
+    if not ql:
+        return -1;
 
-    return architecture_id
+    architecture_id = ql[0][0];
+    architecture_id_cache[architecture] = architecture_id;
+
+    return architecture_id;
 
 def get_archive_id (archive):
     global archive_id_cache
 
+    archive = archive.lower();
+
     if archive_id_cache.has_key(archive):
         return archive_id_cache[archive]
 
-    q = projectB.query("SELECT id FROM archive WHERE name = '%s'" % (archive))
-    archive_id = q.getresult()[0][0]
+    q = projectB.query("SELECT id FROM archive WHERE lower(name) = '%s'" % (archive));
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    archive_id = ql[0][0]
     archive_id_cache[archive] = archive_id
 
     return archive_id
@@ -80,15 +167,17 @@ def get_archive_id (archive):
 def get_component_id (component):
     global component_id_cache
 
+    component = component.lower();
+
     if component_id_cache.has_key(component):
         return component_id_cache[component]
 
-    q = projectB.query("SELECT id FROM component WHERE lower(name) = '%s'" % (string.lower(component)))
+    q = projectB.query("SELECT id FROM component WHERE lower(name) = '%s'" % (component))
     ql = q.getresult();
-    if ql == []:
+    if not ql:
         return -1;
 
-    component_id = ql[0][0]
+    component_id = ql[0][0];
     component_id_cache[component] = component_id
 
     return component_id
@@ -107,7 +196,11 @@ def get_location_id (location, component, archive):
             q = projectB.query("SELECT id FROM location WHERE path = '%s' AND component = %d AND archive = %d" % (location, component_id, archive_id))
     else:
         q = projectB.query("SELECT id FROM location WHERE path = '%s' AND archive = %d" % (location, archive_id))
-    location_id = q.getresult()[0][0]
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    location_id = ql[0][0]
     location_id_cache[cache_key] = location_id
 
     return location_id
@@ -129,7 +222,7 @@ def get_source_id (source, version):
 
     return source_id
 
-##########################################################################################
+################################################################################
 
 def get_or_set_maintainer_id (maintainer):
     global maintainer_id_cache
@@ -146,7 +239,41 @@ def get_or_set_maintainer_id (maintainer):
 
     return maintainer_id
 
-##########################################################################################
+################################################################################
+
+def get_or_set_uid_id (uid):
+    global uid_id_cache;
+
+    if uid_id_cache.has_key(uid):
+        return uid_id_cache[uid];
+
+    q = projectB.query("SELECT id FROM uid WHERE uid = '%s'" % (uid))
+    if not q.getresult():
+        projectB.query("INSERT INTO uid (uid) VALUES ('%s')" % (uid));
+        q = projectB.query("SELECT id FROM uid WHERE uid = '%s'" % (uid));
+    uid_id = q.getresult()[0][0];
+    uid_id_cache[uid] = uid_id;
+
+    return uid_id;
+
+################################################################################
+
+def get_or_set_fingerprint_id (fingerprint):
+    global fingerprint_id_cache;
+
+    if fingerprint_id_cache.has_key(fingerprint):
+        return fingerprint_id_cache[fingerprint]
+
+    q = projectB.query("SELECT id FROM fingerprint WHERE fingerprint = '%s'" % (fingerprint));
+    if not q.getresult():
+        projectB.query("INSERT INTO fingerprint (fingerprint) VALUES ('%s')" % (fingerprint));
+        q = projectB.query("SELECT id FROM fingerprint WHERE fingerprint = '%s'" % (fingerprint));
+    fingerprint_id = q.getresult()[0][0];
+    fingerprint_id_cache[fingerprint] = fingerprint_id;
+
+    return fingerprint_id;
+
+################################################################################
 
 def get_files_id (filename, size, md5sum, location_id):
     global files_id_cache
@@ -156,36 +283,51 @@ def get_files_id (filename, size, md5sum, location_id):
     if files_id_cache.has_key(cache_key):
         return files_id_cache[cache_key]
 
+    size = int(size);
     q = projectB.query("SELECT id, size, md5sum FROM files WHERE filename = '%s' AND location = %d" % (filename, location_id));
     ql = q.getresult();
     if ql:
         if len(ql) != 1:
             return -1;
-        ql = ql[0] 
-        orig_size = ql[1];
+        ql = ql[0];
+        orig_size = int(ql[1]);
         orig_md5sum = ql[2];
         if orig_size != size or orig_md5sum != md5sum:
             return -2;
-        files_id_cache[cache_key] = ql[0]
+        files_id_cache[cache_key] = ql[0];
         return files_id_cache[cache_key]
     else:
         return None
 
 
-##########################################################################################
+################################################################################
 
 def set_files_id (filename, size, md5sum, location_id):
     global files_id_cache
 
-    cache_key = "%s~%d" % (filename, location_id);
+    projectB.query("INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, location_id));
+
+    return get_files_id (filename, size, md5sum, location_id);
+
+    ### currval has issues with postgresql 7.1.3 when the table is big;
+    ### it was taking ~3 seconds to return on auric which is very Not
+    ### Cool(tm).
+    ##
+    ##q = projectB.query("SELECT id FROM files WHERE id = currval('files_id_seq')");
+    ##ql = q.getresult()[0];
+    ##cache_key = "%s~%d" % (filename, location_id);
+    ##files_id_cache[cache_key] = ql[0]
+    ##return files_id_cache[cache_key];
+
+################################################################################
 
-    #print "INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, location_id);
-    projectB.query("INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, location_id)); 
-    q = projectB.query("SELECT id FROM files WHERE id = currval('files_id_seq')");
-    ql = q.getresult()[0];
-    files_id_cache[cache_key] = ql[0]
+def get_maintainer (maintainer_id):
+    global maintainer_cache;
 
-    return files_id_cache[cache_key]
+    if not maintainer_cache.has_key(maintainer_id):
+        q = projectB.query("SELECT name FROM maintainer WHERE id = %s" % (maintainer_id));
+        maintainer_cache[maintainer_id] = q.getresult()[0][0];
 
-##########################################################################################
+    return maintainer_cache[maintainer_id];
 
+################################################################################