From b17b12465f93aef1abeb821e2393426c94269048 Mon Sep 17 00:00:00 2001 From: James Troup Date: Fri, 22 Feb 2002 22:49:19 +0000 Subject: [PATCH] add convenience debug function and fix set_files_id to not take 3 seconds by avoiding currval --- db_access.py | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/db_access.py b/db_access.py index 216f4e76..7a5d323b 100644 --- a/db_access.py +++ b/db_access.py @@ -1,6 +1,6 @@ # DB access fucntions # Copyright (C) 2000, 2001 James Troup -# $Id: db_access.py,v 1.11 2002-02-12 23:13:49 troup Exp $ +# $Id: db_access.py,v 1.12 2002-02-22 22:49:19 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 +18,7 @@ ############################################################################################ -import string +import string, sys, time; ############################################################################################ @@ -46,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): @@ -270,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]; ########################################################################################## -- 2.39.5