diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-12-27 14:05:12 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-12-27 14:05:12 +0000 |
| commit | f56935a8a6893ca27b8bebea15c452167764f901 (patch) | |
| tree | fe9e50af68bb726d86a79f6fcdc3f8348e062260 /guix-data-service/model | |
| parent | 6c1adfa9e6625616b973527edd9996417d3b2212 (diff) | |
| download | data-service-f56935a8a6893ca27b8bebea15c452167764f901.tar data-service-f56935a8a6893ca27b8bebea15c452167764f901.tar.gz | |
Change the language around reproducibility/matching outputs
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.
Diffstat (limited to 'guix-data-service/model')
| -rw-r--r-- | guix-data-service/model/derivation.scm | 12 | ||||
| -rw-r--r-- | guix-data-service/model/nar.scm | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm index 9cb6ec6..591ad91 100644 --- a/guix-data-service/model/derivation.scm +++ b/guix-data-service/model/derivation.scm @@ -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 diff --git a/guix-data-service/model/nar.scm b/guix-data-service/model/nar.scm index 9525ee5..9788e95 100644 --- a/guix-data-service/model/nar.scm +++ b/guix-data-service/model/nar.scm @@ -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))))) |