summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerie R Young <spectranaut@riseup.net>2016-10-25 15:13:56 -0400
committerHolger Levsen <holger@layer-acht.org>2016-10-25 21:49:26 +0200
commite4e4bd6fa5fbb5edb546d60147d4b594ef6829f1 (patch)
tree0314a83806c9984ddaf997000b00212d5a09d943
parent573b7786a828268d6eb2c26ceb74814a7041cf64 (diff)
downloadjenkins.debian.net-e4e4bd6fa5fbb5edb546d60147d4b594ef6829f1.tar.xz
reproducible debian: speed up _html_notes.py a bit
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_html_notes.py25
1 files changed, 20 insertions, 5 deletions
diff --git a/bin/reproducible_html_notes.py b/bin/reproducible_html_notes.py
index f588b149..953e5a8a 100755
--- a/bin/reproducible_html_notes.py
+++ b/bin/reproducible_html_notes.py
@@ -19,6 +19,7 @@ from math import sqrt
from reproducible_common import *
from reproducible_html_packages import gen_packages_html
from reproducible_html_indexes import build_page
+from sqlalchemy import select, and_, bindparam
renderer = pystache.Renderer()
notes_body_template = renderer.load_template(
@@ -274,11 +275,28 @@ def gen_html_issue(issue, suite):
url = ''
# add affected packages:
affected = ''
+
+ results = db_table('results')
+ sources = db_table('sources')
+ sql = select(
+ [sources.c.name]
+ ).select_from(
+ results.join(sources)
+ ).where(
+ and_(
+ sources.c.suite == bindparam('suite'),
+ sources.c.architecture == bindparam('arch'),
+ results.c.status == bindparam('status'),
+ )
+ ).order_by(
+ sources.c.name
+ )
try:
arch = 'amd64'
for status in ['unreproducible', 'FTBFS', 'not for us', 'blacklisted', 'reproducible', 'depwait']:
- pkgs = [x[0] for x in all_pkgs
- if x[1] == status and x[2] == suite and x[3] == arch and x[0] in issues_count[issue]]
+ pkgs = query_db(sql.where(sources.c.name.in_(issues_count[issue]))\
+ .params({'suite': suite, 'arch': arch, 'status': status}))
+ pkgs = [p[0] for p in pkgs]
if not pkgs:
continue
affected += tab*4 + '<p>\n'
@@ -458,9 +476,6 @@ def index_issues(issues, scorefuncs):
if __name__ == '__main__':
- all_pkgs = query_db('SELECT s.name, r.status, s.suite, s.architecture ' +
- 'FROM results AS r JOIN sources AS s ON r.package_id=s.id ' +
- 'ORDER BY s.name')
issues_count = {}
bugs = get_bugs()
notes = load_notes()