cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the language around reproducibility/matching outputs

Browse source 
It's more accurate to describe the specifics of the relevant data here through
terms like "matching" and "not matching", as a statement that something built
reproducibility needs to be made alongside the test conditions. So just say
that build outputs matched, or didn't match, as this is more descriptive of
the data available.
This commit is contained in:
Christopher Baines 2019-12-27 14:05:12 +00:00
parent 6c1adfa9e6
commit f56935a8a6
4 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
guix-data-service/model/derivation.scm
View file

@ -325,7 +325,7 @@ ORDER BY derivations.file_name
(define* (select-derivation-outputs-in-revision conn
commit-hash
#:key
reproducibility-status
output-consistency
system
target
limit-results
@ -387,9 +387,9 @@ WHERE guix_revisions.commit = $1
criteria
(iota (length criteria) 2))))
(cond
((string=? reproducibility-status "any")
((string=? output-consistency "any")
"")
((string=? reproducibility-status "fixed-output")
((string=? output-consistency "fixed-output")
" AND derivation_output_details.hash IS NOT NULL")
(else
(string-append
@ -397,15 +397,15 @@ WHERE guix_revisions.commit = $1
SELECT
"
(cond
((string=? reproducibility-status "unknown")
((string=? output-consistency "unknown")
"COUNT(DISTINCT narinfo_fetch_records.build_server_id) <= 1")
((string=? reproducibility-status "reproducible")
((string=? output-consistency "matching")
"
CASE
WHEN (COUNT(DISTINCT narinfo_fetch_records.build_server_id) <= 1) THEN NULL
ELSE (COUNT(DISTINCT nars.hash) = 1)
END")
((string=? reproducibility-status "unreproducible")
((string=? output-consistency "not-matching")
"
CASE
WHEN (COUNT(DISTINCT narinfo_fetch_records.build_server_id) <= 1) THEN NULL

8
guix-data-service/model/nar.scm
View file

@ -30,7 +30,7 @@
select-nars-for-output
select-signing-key
select-reproducibility-status-for-revision
select-output-consistency-for-revision
record-narinfo-details-and-return-ids))
@ -236,7 +236,7 @@ VALUES ($1, $2)")
(list (list (cons "jsonb"
public-key-json-string)))))))
(define (select-reproducibility-status-for-revision conn revision-commit)
(define (select-output-consistency-for-revision conn revision-commit)
(define query
"
SELECT system, target, reproducible, COUNT(*)
@ -291,8 +291,8 @@ ORDER BY COUNT(*) DESC")
((system target status count)
(list system
(match status
("t" 'reproducible)
("f" 'unreproducible)
("t" 'matching)
("f" 'not-matching)
("" 'unknown))
(string->number count))))
(exec-query conn query (list revision-commit)))))