X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=c4f213e4740d22cf52915b7d15fa78efea561dee;hb=fa7b68ee3d2c9d467669021fd62e09a407e1244a;hp=a4d0e736b910ba9dfcd242a36d35862b1901850d;hpb=b5ee62da9921f9e14343e880c156ab1bf9896190;p=dak.git diff --git a/db_access.py b/db_access.py index a4d0e736..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 -# $Id: db_access.py,v 1.7 2001-04-03 10:01:27 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $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,16 +37,26 @@ location_id_cache = {}; maintainer_id_cache = {}; source_id_cache = {}; files_id_cache = {}; -maintainer_cache = {} +maintainer_cache = {}; +fingerprint_id_cache = {}; ############################################################################################ def init (config, sql): global Cnf, projectB - + 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): @@ -53,9 +67,9 @@ def get_suite_id (suite): q = projectB.query("SELECT id FROM suite WHERE suite_name = '%s'" % (suite)) ql = q.getresult(); - if ql == []: - return -1; - + if not ql: + return -1; + suite_id = ql[0][0]; suite_id_cache[suite] = suite_id @@ -69,9 +83,9 @@ def get_section_id (section): q = projectB.query("SELECT id FROM section WHERE section = '%s'" % (section)) ql = q.getresult(); - if ql == []: - return -1; - + if not ql: + return -1; + section_id = ql[0][0]; section_id_cache[section] = section_id @@ -85,9 +99,9 @@ def get_priority_id (priority): q = projectB.query("SELECT id FROM priority WHERE priority = '%s'" % (priority)) ql = q.getresult(); - if ql == []: - return -1; - + if not ql: + return -1; + priority_id = ql[0][0]; priority_id_cache[priority] = priority_id @@ -101,9 +115,9 @@ def get_override_type_id (type): q = projectB.query("SELECT id FROM override_type WHERE type = '%s'" % (type)); ql = q.getresult(); - if ql == []: - return -1; - + if not ql: + return -1; + override_type_id = ql[0][0]; override_type_id_cache[type] = override_type_id; @@ -117,9 +131,9 @@ def get_architecture_id (architecture): q = projectB.query("SELECT id FROM architecture WHERE arch_string = '%s'" % (architecture)) ql = q.getresult(); - if ql == []: + if not ql: return -1; - + architecture_id = ql[0][0]; architecture_id_cache[architecture] = architecture_id; @@ -128,11 +142,17 @@ 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)) - archive_id = q.getresult()[0][0] + q = projectB.query("SELECT id FROM archive WHERE lower(name) = '%s'" % (archive)); + ql = q.getresult(); + if not ql: + return -1; + + archive_id = ql[0][0] archive_id_cache[archive] = archive_id return archive_id @@ -140,12 +160,14 @@ 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 ql == []: + if not ql: return -1; component_id = ql[0][0]; @@ -167,7 +189,11 @@ def get_location_id (location, component, archive): q = projectB.query("SELECT id FROM location WHERE path = '%s' AND component = %d AND archive = %d" % (location, component_id, archive_id)) else: q = projectB.query("SELECT id FROM location WHERE path = '%s' AND archive = %d" % (location, archive_id)) - location_id = q.getresult()[0][0] + ql = q.getresult(); + if not ql: + return -1; + + location_id = ql[0][0] location_id_cache[cache_key] = location_id return location_id @@ -208,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 @@ -222,7 +265,7 @@ def get_files_id (filename, size, md5sum, location_id): if ql: if len(ql) != 1: return -1; - ql = ql[0]; + ql = ql[0]; orig_size = int(ql[1]); orig_md5sum = ql[2]; if orig_size != size or orig_md5sum != md5sum: @@ -238,25 +281,29 @@ 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); + projectB.query("INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, 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 get_files_id (filename, size, md5sum, location_id); - return files_id_cache[cache_key] + ### 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; - + if not maintainer_cache.has_key(maintainer_id): q = projectB.query("SELECT name FROM maintainer WHERE id = %s" % (maintainer_id)); maintainer_cache[maintainer_id] = q.getresult()[0][0]; - + return maintainer_cache[maintainer_id]; ##########################################################################################