X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=ed0c482047ed5cf8c3cf536f3172243b32cbe001;hb=cabe09b4d162c7f680b07863cc043359545dabdd;hp=afbddeeba1cd32cc35b933719b571f95c13f0869;hpb=dda5d46b7124722b8a7272ffc5c9983a7417a55d;p=dak.git

diff --git a/db_access.py b/db_access.py
index afbddeeb..ed0c4820 100644
--- a/db_access.py
+++ b/db_access.py
@@ -1,6 +1,6 @@
 # DB access fucntions
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: db_access.py,v 1.10 2001-11-24 18:42:05 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: db_access.py,v 1.13 2002-05-03 16:06:45 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 +16,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 string, sys, time;
 
 ############################################################################################
 
@@ -33,7 +35,8 @@ location_id_cache = {};
 maintainer_id_cache = {};
 source_id_cache = {};
 files_id_cache = {};
-maintainer_cache = {}
+maintainer_cache = {};
+fingerprint_id_cache = {};
 
 ############################################################################################
 
@@ -43,6 +46,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):
@@ -220,6 +232,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
 
@@ -250,15 +279,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];
 
 ##########################################################################################