X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=cbdfad04e5a4504f204210802bdc5efc9236a75f;hb=52b14d883272923a4296ac02921ccf350815db83;hp=3cbb67b7e57b7b9e4ffca2035900af4aaced35dc;hpb=cd5b29ddfd8de263c085f494b9573d683913f6f3;p=dak.git diff --git a/daklib/database.py b/daklib/database.py index 3cbb67b7..cbdfad04 100755 --- a/daklib/database.py +++ b/daklib/database.py @@ -3,8 +3,10 @@ """ DB access functions @group readonly: get_suite_id, get_section_id, get_priority_id, get_override_type_id, get_architecture_id, get_archive_id, get_component_id, get_location_id, - get_source_id, get_suite_version, get_files_id, get_maintainer, get_suites + get_source_id, get_suite_version, get_files_id, get_maintainer, get_suites, + get_suite_architectures, get_new_comments, has_new_comment @group read/write: get_or_set*, set_files_id +@group writeonly: add_new_comment, delete_new_comments @contact: Debian FTP Master @copyright: 2000, 2001, 2002, 2003, 2004, 2006 James Troup @@ -31,6 +33,8 @@ import sys import time import types +import utils +import pg ################################################################################ @@ -47,6 +51,7 @@ location_id_cache = {} #: cache for locations maintainer_id_cache = {} #: cache for maintainers keyring_id_cache = {} #: cache for keyrings source_id_cache = {} #: cache for sources + files_id_cache = {} #: cache for files maintainer_cache = {} #: cache for maintainer names fingerprint_id_cache = {} #: cache for fingerprints @@ -54,9 +59,6 @@ queue_id_cache = {} #: cache for queues uid_id_cache = {} #: cache for uids suite_version_cache = {} #: cache for suite_versions (packages) suite_bin_version_cache = {} -content_path_id_cache = {} -content_file_id_cache = {} -insert_contents_file_cache = {} cache_preloaded = False ################################################################################ @@ -77,31 +79,6 @@ def init (config, sql): Cnf = config projectB = sql - -def do_query(query): - """ - Executes a database query. Writes statistics / timing to stderr. - - @type query: string - @param query: database query string, passed unmodified - - @return: db result - - @warning: The query is passed B{unmodified}, so be careful what you use this for. - """ - sys.stderr.write("query: \"%s\" ... " % (query)) - before = time.time() - r = projectB.query(query) - 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): @@ -459,6 +436,59 @@ def preload_binary_id_cache(): cache_preloaded = True +def get_suite_architectures(suite): + """ + Returns list of architectures for C{suite}. + + @type suite: string, int + @param suite: the suite name or the suite_id + + @rtype: list + @return: the list of architectures for I{suite} + """ + + suite_id = None + if type(suite) == str: + suite_id = get_suite_id(suite) + elif type(suite) == int: + suite_id = suite + else: + return None + + sql = """ SELECT a.arch_string FROM suite_architectures sa + JOIN architecture a ON (a.id = sa.architecture) + WHERE suite='%s' """ % (suite_id) + + q = projectB.query(sql) + return map(lambda x: x[0], q.getresult()) + +def get_suite_untouchable(suite): + """ + Returns true if the C{suite} is untouchable, otherwise false. + + @type suite: string, int + @param suite: the suite name or the suite_id + + @rtype: boolean + @return: status of suite + """ + + suite_id = None + if type(suite) == str: + suite_id = get_suite_id(suite.lower()) + elif type(suite) == int: + suite_id = suite + else: + return None + + sql = """ SELECT untouchable FROM suite WHERE id='%s' """ % (suite_id) + + q = projectB.query(sql) + if q.getresult()[0][0] == "f": + return False + else: + return True + ################################################################################ def get_or_set_maintainer_id (maintainer): @@ -781,58 +811,158 @@ def get_suites(pkgname, src=False): q = projectB.query(sql) return map(lambda x: x[0], q.getresult()) + ################################################################################ -def get_or_set_contents_file_id(file): - global content_file_id_cache +def get_new_comments(package): + """ + Returns all the possible comments attached to C{package} in NEW. All versions. - if not content_file_id_cache.has_key(file): - sql_select = "SELECT id FROM content_file_names WHERE file = '%s'" % file - q = projectB.query(sql_select) - if not q.getresult(): - # since this can be called within a transaction, we can't use currval - q = projectB.query("INSERT INTO content_file_names VALUES (DEFAULT, '%s') RETURNING id" % (file)) - content_file_id_cache[file] = int(q.getresult()[0][0]) - return content_file_id_cache[file] + @type package: string + @param package: name of the package -################################################################################ + @rtype: list + @return: list of strings containing comments for all versions from all authors for package + """ -def get_or_set_contents_path_id(path): - global content_path_id_cache + comments = [] + query = projectB.query(""" SELECT version, comment, author, notedate + FROM new_comments + WHERE package = '%s' + ORDER BY notedate + """ % (package)) - if not content_path_id_cache.has_key(path): - sql_select = "SELECT id FROM content_file_paths WHERE path = '%s'" % path - q = projectB.query(sql_select) - if not q.getresult(): - # since this can be called within a transaction, we can't use currval - q = projectB.query("INSERT INTO content_file_paths VALUES (DEFAULT, '%s') RETURNING id" % (path)) - content_path_id_cache[path] = int(q.getresult()[0][0]) - return content_path_id_cache[path] + for row in query.getresult(): + comments.append("\nAuthor: %s\nVersion: %s\nTimestamp: %s\n\n%s\n" % (row[2], row[0], row[3], row[1])) + comments.append("-"*72) -################################################################################ + return comments -def insert_content_path(bin_id, fullpath): - global insert_contents_file_cache - cache_key = "%s_%s" % (bin_id, fullpath) +def has_new_comment(package, version, ignore_trainee=False): + """ + Returns true if the given combination of C{package}, C{version} has a comment. + If C{ignore_trainee} is true, comments from a trainee are ignored. + + @type package: string + @param package: name of the package + + @type version: string + @param version: package version + + @type ignore_trainee: boolean + @param ignore_trainee: ignore trainee comments - # have we seen this contents before? - # probably only revelant during package import - if insert_contents_file_cache.has_key(cache_key): - return + @rtype: boolean + @return: true/false + """ - # split the path into basename, and pathname - (path, file) = os.path.split(fullpath) + trainee="" + if ignore_trainee: + trainee='AND trainee=false' - # Get the necessary IDs ... - file_id = get_or_set_contents_file_id(file) - path_id = get_or_set_contents_path_id(path) + exists = projectB.query("""SELECT 1 FROM new_comments + WHERE package='%s' + AND version='%s' + %s + LIMIT 1""" + % (package, version, trainee) ).getresult() + + if not exists: + return False + else: + return True + +def add_new_comment(package, version, comment, author, trainee=False): + """ + Add a new comment for C{package}, C{version} written by C{author} - # Determine if we're inserting a duplicate row - q = projectB.query("SELECT 1 FROM content_associations WHERE binary_pkg = '%d' AND filepath = '%d' AND filename = '%d'" % (int(bin_id), path_id, file_id)) - if q.getresult(): - # Yes we are, return without doing the insert - return + @type package: string + @param package: name of the package + + @type version: string + @param version: package version + + @type comment: string + @param comment: the comment + + @type author: string + @param author: the authorname + + @type trainee: boolean + @param trainee: trainee comment + """ + + projectB.query(""" INSERT INTO new_comments (package, version, comment, author, trainee) + VALUES ('%s', '%s', '%s', '%s', '%s') + """ % (package, version, pg.escape_string(comment), pg.escape_string(author), trainee)) - # Put them into content_assiocations - projectB.query("INSERT INTO content_associations VALUES (DEFAULT, '%d', '%d', '%d')" % (bin_id, path_id, file_id)) return + +def delete_new_comments(package, version): + """ + Delete a comment for C{package}, C{version}, if one exists + """ + + projectB.query(""" DELETE FROM new_comments + WHERE package = '%s' AND version = '%s' + """ % (package, version)) + return + +def delete_all_new_comments(package): + """ + Delete all comments for C{package}, if they exist + """ + + projectB.query(""" DELETE FROM new_comments + WHERE package = '%s' + """ % (package)) + return + +################################################################################ +def copy_temporary_contents(package, version, arch, deb, reject): + """ + copy the previously stored contents from the temp table to the permanant one + + during process-unchecked, the deb should have been scanned and the + contents stored in pending_content_associations + """ + + # first see if contents exist: + + arch_id = get_architecture_id (arch) + + exists = projectB.query("""SELECT 1 FROM pending_content_associations + WHERE package='%s' + AND version='%s' + AND architecture=%d LIMIT 1""" + % (package, version, arch_id) ).getresult() + + if not exists: + # This should NOT happen. We should have added contents + # during process-unchecked. if it did, log an error, and send + # an email. + subst = { + "__PACKAGE__": package, + "__VERSION__": version, + "__ARCH__": arch, + "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"], + "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] } + + message = utils.TemplateSubst(subst, Cnf["Dir::Templates"]+"/missing-contents") + utils.send_mail( message ) + + exists = Binary(deb, reject).scan_package() + + if exists: + sql = """INSERT INTO content_associations(binary_pkg,filepath,filename) + SELECT currval('binaries_id_seq'), filepath, filename FROM pending_content_associations + WHERE package='%s' + AND version='%s' + AND architecture=%d""" % (package, version, arch_id) + projectB.query(sql) + projectB.query("""DELETE from pending_content_associations + WHERE package='%s' + AND version='%s' + AND architecture=%d""" % (package, version, arch_id)) + + return exists