From b53415a50ea42843703f38aad5294b88ba8de3db Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 18 May 2016 15:50:17 +0200 Subject: [PATCH] generate_releases: refactor by-hash handling Move hashfile update and by-hash links creation to separate methods. No actual code changes. Signed-off-by: Julien Cristau --- dak/generate_releases.py | 126 ++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/dak/generate_releases.py b/dak/generate_releases.py index dc46b24b..9c065ace 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -194,6 +194,69 @@ class ReleaseWriter(object): if e.errno != errno.EEXIST: raise + def _update_hashfile_table(self, session, fileinfo, hashes): + # Mark all by-hash files as obsolete. We will undo that for the ones + # we still reference later. + query = """ + UPDATE hashfile SET unreferenced = CURRENT_TIMESTAMP + WHERE suite_id = :id AND unreferenced IS NULL""" + session.execute(query, {'id': self.suite.suite_id}) + + if self.suite.byhash: + query = "SELECT path FROM hashfile WHERE suite_id = :id" + q = session.execute(query, {'id': self.suite.suite_id}) + known_hashfiles = set(row[0] for row in q) + updated = [] + new = [] + + # Update the hashfile table with new or updated files + for filename in fileinfo: + if not os.path.exists(filename): + # probably an uncompressed index we didn't generate + continue + byhashdir = os.path.join(os.path.dirname(filename), 'by-hash') + for h in hashes: + field = h.release_field + hashfile = os.path.join(byhashdir, field, fileinfo[filename][field]) + if hashfile in known_hashfiles: + updated.append(hashfile) + else: + new.append(hashfile) + + if updated: + session.execute(""" + UPDATE hashfile SET unreferenced = NULL + WHERE path = ANY(:p) AND suite_id = :id""", + {'p': updated, 'id': self.suite.suite_id}) + if new: + session.execute(""" + INSERT INTO hashfile (path, suite_id) + VALUES (:p, :id)""", + [{'p': hashfile, 'id': self.suite.suite_id} for hashfile in new]) + + session.commit() + + def _make_byhash_links(self, fileinfo, hashes): + # Create hardlinks in by-hash directories + for filename in fileinfo: + if not os.path.exists(filename): + # probably an uncompressed index we didn't generate + continue + + for h in hashes: + field = h.release_field + hashfile = os.path.join(os.path.dirname(filename), 'by-hash', field, fileinfo[filename][field]) + try: + os.makedirs(os.path.dirname(hashfile)) + except OSError as exc: + if exc.errno != errno.EEXIST: + raise + try: + os.link(filename, hashfile) + except OSError as exc: + if exc.errno != errno.EEXIST: + raise + def generate_release_files(self): """ Generate Release files for the given suite @@ -362,68 +425,9 @@ class ReleaseWriter(object): out.close() os.rename(outfile + '.new', outfile) - # Mark all by-hash files as obsolete. We will undo that for the ones - # we still reference later. - query = """ - UPDATE hashfile SET unreferenced = CURRENT_TIMESTAMP - WHERE suite_id = :id AND unreferenced IS NULL""" - session.execute(query, {'id': suite.suite_id}) - - if suite.byhash: - query = "SELECT path FROM hashfile WHERE suite_id = :id" - q = session.execute(query, {'id': suite.suite_id}) - known_hashfiles = set(row[0] for row in q) - updated = [] - new = [] - - # Update the hashfile table with new or updated files - for filename in fileinfo: - if not os.path.exists(filename): - # probably an uncompressed index we didn't generate - continue - byhashdir = os.path.join(os.path.dirname(filename), 'by-hash') - for h in hashes: - field = h.release_field - hashfile = os.path.join(byhashdir, field, fileinfo[filename][field]) - if hashfile in known_hashfiles: - updated.append(hashfile) - else: - new.append(hashfile) - - if updated: - session.execute(""" - UPDATE hashfile SET unreferenced = NULL - WHERE path = ANY(:p) AND suite_id = :id""", - {'p': updated, 'id': suite.suite_id}) - if new: - session.execute(""" - INSERT INTO hashfile (path, suite_id) - VALUES (:p, :id)""", - [{'p': hashfile, 'id': suite.suite_id} for hashfile in new]) - - session.commit() - + self._update_hashfile_table(session, fileinfo, hashes) if suite.byhash: - # Create hardlinks in by-hash directories - for filename in fileinfo: - if not os.path.exists(filename): - # probably an uncompressed index we didn't generate - continue - - for h in hashes: - field = h.release_field - hashfile = os.path.join(os.path.dirname(filename), 'by-hash', field, fileinfo[filename][field]) - try: - os.makedirs(os.path.dirname(hashfile)) - except OSError as exc: - if exc.errno != errno.EEXIST: - raise - try: - os.link(filename, hashfile) - except OSError as exc: - if exc.errno != errno.EEXIST: - raise - + self._make_byhash_links(fileinfo, hashes) sign_release_dir(suite, os.path.dirname(outfile)) -- 2.39.5