diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-09-01 13:35:23 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-09-01 18:32:09 +0100 |
| commit | 91a9ba43498ffcd6149854eaa6b071d8b16e4cf3 (patch) | |
| tree | 000af25a1d8d6b866d846e4c3461010febf66f73 /guix-data-service/jobs | |
| parent | c1fad22cd1767b8f64c66a1bd2f47ecf387a992a (diff) | |
| download | data-service-91a9ba43498ffcd6149854eaa6b071d8b16e4cf3.tar data-service-91a9ba43498ffcd6149854eaa6b071d8b16e4cf3.tar.gz | |
Add a new table guix_revision_lint_checkers
To associate a set of lint checkers with a specific revision. While there is
the association through the lint warnings, that only works for checkers where
there are lint warnings for that revision.
Therefore, to allow finding all the checkers for a specific revision, also
associate them directly with the revision.
Diffstat (limited to 'guix-data-service/jobs')
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 93 |
1 files changed, 49 insertions, 44 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index b146afc..75eae4d 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -457,50 +457,46 @@ WHERE job_id = $1" conn packages packages-metadata-ids))))) (define (insert-lint-warnings conn inferior-package-id->package-database-id + lint-checker-ids lint-warnings-data) - (let ((lint-checker-ids - (lint-checkers->lint-checker-ids - conn - (map car lint-warnings-data)))) - - (lint-warnings-data->lint-warning-ids - conn - (append-map - (lambda (lint-checker-id warnings-by-package-id) - (append-map - (match-lambda - ((package-id . warnings) - (map - (match-lambda - ((location-data messages-by-locale) - (let ((location-id - (location->location-id - conn - (apply location location-data))) - (lint-warning-message-set-id - (lint-warning-message-data->lint-warning-message-set-id - conn - messages-by-locale))) - (list lint-checker-id - (inferior-package-id->package-database-id package-id) - location-id - lint-warning-message-set-id)))) - (fold (lambda (location-and-messages result) - (if (member location-and-messages result) - (begin - (apply - simple-format - (current-error-port) - "warning: skipping duplicate lint warning ~A ~A" - location-and-messages) - result) - (append result - (list location-and-messages)))) - '() - warnings)))) - warnings-by-package-id)) - lint-checker-ids - (map cdr lint-warnings-data))))) + (lint-warnings-data->lint-warning-ids + conn + (append-map + (lambda (lint-checker-id warnings-by-package-id) + (append-map + (match-lambda + ((package-id . warnings) + (map + (match-lambda + ((location-data messages-by-locale) + (let ((location-id + (location->location-id + conn + (apply location location-data))) + (lint-warning-message-set-id + (lint-warning-message-data->lint-warning-message-set-id + conn + messages-by-locale))) + (list lint-checker-id + (inferior-package-id->package-database-id package-id) + location-id + lint-warning-message-set-id)))) + (fold (lambda (location-and-messages result) + (if (member location-and-messages result) + (begin + (apply + simple-format + (current-error-port) + "warning: skipping duplicate lint warning ~A ~A" + location-and-messages) + result) + (append result + (list location-and-messages)))) + '() + warnings)))) + warnings-by-package-id)) + lint-checker-ids + (map cdr lint-warnings-data)))) (define (inferior-data->package-derivation-ids conn inf @@ -807,10 +803,15 @@ WHERE job_id = $1" #t "debug: finished loading information from inferior\n") (close-inferior inf) - (let* ((lint-warning-ids + (let* ((lint-checker-ids + (lint-checkers->lint-checker-ids + conn + (map car inferior-lint-warnings))) + (lint-warning-ids (insert-lint-warnings conn inferior-package-id->package-database-id + lint-checker-ids inferior-lint-warnings)) (package-derivation-ids (inferior-data->package-derivation-ids @@ -820,6 +821,10 @@ WHERE job_id = $1" (insert-guix-revision conn git-repository-id commit store-path))) + (insert-guix-revision-lint-checkers conn + guix-revision-id + lint-checker-ids) + (insert-guix-revision-lint-warnings conn guix-revision-id lint-warning-ids) |