X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=c4f213e4740d22cf52915b7d15fa78efea561dee;hb=2848b994404dac5dcce3420f89543b91d35d254f;hp=216f4e76071d9aa5c48e596e9beab14c6e457ce7;hpb=1e54d0951f0183cc750f0a8b596c3b830dab43ff;p=dak.git

diff --git a/db_access.py b/db_access.py
index 216f4e76..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.11 2002-02-12 23:13:49 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
@@ -18,7 +20,7 @@
 
 ############################################################################################
 
-import string
+import sys, time;
 
 ############################################################################################
 
@@ -46,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):
@@ -131,7 +142,7 @@ def get_architecture_id (architecture):
 def get_archive_id (archive):
     global archive_id_cache
 
-    archive = string.lower(archive);
+    archive = archive.lower();
 
     if archive_id_cache.has_key(archive):
         return archive_id_cache[archive]
@@ -149,7 +160,7 @@ def get_archive_id (archive):
 def get_component_id (component):
     global component_id_cache
 
-    component = string.lower(component);
+    component = component.lower();
 
     if component_id_cache.has_key(component):
         return component_id_cache[component]
@@ -270,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];
 
 ##########################################################################################