X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=c4f213e4740d22cf52915b7d15fa78efea561dee;hb=1326841f69c50e9494365f74daac134ead0710d9;hp=2fe45177bce8022a91ddbaf994d1305254c39370;hpb=c30e23562021f4ead23579ed4206f7acb3201204;p=dak.git

diff --git a/db_access.py b/db_access.py
index 2fe45177..c4f213e4 100644
--- a/db_access.py
+++ b/db_access.py
@@ -1,6 +1,8 @@
+#!/usr/bin/env python
+
 # DB access fucntions
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: db_access.py,v 1.9 2001-11-04 22:34:02 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: db_access.py,v 1.14 2002-10-16 02:47:32 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,7 +18,9 @@
 # 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;
 
 ############################################################################################
 
@@ -33,7 +37,8 @@ location_id_cache = {};
 maintainer_id_cache = {};
 source_id_cache = {};
 files_id_cache = {};
-maintainer_cache = {}
+maintainer_cache = {};
+fingerprint_id_cache = {};
 
 ############################################################################################
 
@@ -43,6 +48,15 @@ def init (config, sql):
     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));
+    return r;
+
 ############################################################################################
 
 def get_suite_id (suite):
@@ -128,10 +142,12 @@ def get_architecture_id (architecture):
 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))
+    q = projectB.query("SELECT id FROM archive WHERE lower(name) = '%s'" % (archive));
     ql = q.getresult();
     if not ql:
         return -1;
@@ -144,10 +160,12 @@ 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 not ql:
         return -1;
@@ -216,6 +234,23 @@ def get_or_set_maintainer_id (maintainer):
 
 ##########################################################################################
 
+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
 
@@ -246,15 +281,19 @@ def get_files_id (filename, size, md5sum, location_id):
 def set_files_id (filename, size, md5sum, location_id):
     global files_id_cache
 
-    cache_key = "%s~%d" % (filename, location_id);
-
-    #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]
 
-    return files_id_cache[cache_key]
+    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];
 
 ##########################################################################################