X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=45ce1c1f3b377ac4a0a163831ea0409ff59686a8;hb=7bf33bd6fc9101450df8c928b5d4410d78de11a9;hp=2fe45177bce8022a91ddbaf994d1305254c39370;hpb=c30e23562021f4ead23579ed4206f7acb3201204;p=dak.git diff --git a/db_access.py b/db_access.py index 2fe45177..45ce1c1f 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 -# $Id: db_access.py,v 1.9 2001-11-04 22:34:02 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup +# $Id: db_access.py,v 1.17 2005-12-05 03:45:12 ajt 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,9 +18,11 @@ # 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; @@ -33,9 +37,12 @@ location_id_cache = {}; maintainer_id_cache = {}; source_id_cache = {}; files_id_cache = {}; -maintainer_cache = {} +maintainer_cache = {}; +fingerprint_id_cache = {}; +queue_id_cache = {}; +uid_id_cache = {}; -############################################################################################ +################################################################################ def init (config, sql): global Cnf, projectB @@ -43,7 +50,22 @@ 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)); + 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 @@ -128,10 +150,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 +168,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; @@ -197,7 +223,7 @@ def get_source_id (source, version): return source_id -########################################################################################## +################################################################################ def get_or_set_maintainer_id (maintainer): global maintainer_id_cache @@ -214,7 +240,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 @@ -240,23 +300,42 @@ def get_files_id (filename, size, md5sum, location_id): else: return None +################################################################################ -########################################################################################## +def get_or_set_queue_id (queue): + global queue_id_cache + if queue_id_cache.has_key(queue): + return queue_id_cache[queue] + + q = projectB.query("SELECT id FROM queue WHERE queue_name = '%s'" % (queue)) + if not q.getresult(): + projectB.query("INSERT INTO queue (queue_name) VALUES ('%s')" % (queue)) + q = projectB.query("SELECT id FROM queue WHERE queue_name = '%s'" % (queue)) + queue_id = q.getresult()[0][0] + queue_id_cache[queue] = queue_id + + return queue_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]; -########################################################################################## +################################################################################ def get_maintainer (maintainer_id): global maintainer_cache; @@ -267,4 +346,4 @@ def get_maintainer (maintainer_id): return maintainer_cache[maintainer_id]; -########################################################################################## +################################################################################