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

Fix the select-derivations-with-no-known-build

Browse source 
The equivalent_derivations table was an experiment that didn't work, so switch
to using the derivations_by_output_details_set table.

Also take the build server id as input, as this allows selecting derivations
which have no known build for the relevant build server.
This commit is contained in:
Christopher Baines 2019-12-10 08:30:14 +00:00
parent c90f411e5e
commit af948de646
1 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

50
guix-data-service/builds.scm
View file

@ -104,7 +104,9 @@
(define (process-derivations conn build-server-id url revision-commits) (define (process-derivations conn build-server-id url revision-commits)
(define derivations (define derivations
(select-derivations-with-no-known-build conn revision-commits)) (select-derivations-with-no-known-build conn
build-server-id
revision-commits))
(simple-format (current-error-port) "Fetching ~A derivations\n" (simple-format (current-error-port) "Fetching ~A derivations\n"
(length derivations)) (length derivations))
@ -187,7 +189,9 @@ LIMIT 1000")
derivation-file-name))) derivation-file-name)))
(exec-query conn query (list (number->string build-server-id))))) (exec-query conn query (list (number->string build-server-id)))))
(define (select-derivations-with-no-known-build conn revision-commits) (define (select-derivations-with-no-known-build conn
build-server-id
revision-commits)
(define query (define query
;; Only select derivations that are in the package_derivations table, as ;; Only select derivations that are in the package_derivations table, as
;; Cuirass doesn't build the intermediate derivations ;; Cuirass doesn't build the intermediate derivations
@ -195,37 +199,41 @@ LIMIT 1000")
" "
SELECT derivations.id, derivations.file_name SELECT derivations.id, derivations.file_name
FROM derivations FROM derivations
WHERE derivations.id NOT IN ( INNER JOIN derivations_by_output_details_set
SELECT unnest(equivalent_derivations.derivation_ids) ON derivations.id = derivations_by_output_details_set.derivation_id
FROM equivalent_derivations WHERE derivation_output_details_set_id NOT IN (
WHERE ARRAY[( SELECT derivation_output_details_set_id
SELECT derivations.id WHERE derivations.file_name IN (SELECT derivation_file_name FROM builds) FROM builds
)] <@ equivalent_derivations.derivation_ids WHERE build_server_id = $1
) AND derivations.id IN ( ) AND derivation_output_details_set_id IN (
SELECT unnest(derivation_ids) SELECT derivation_output_details_set_id
FROM package_derivations" FROM package_derivations
(if (null? revision-commits) INNER JOIN derivations_by_output_details_set
"\n" ON package_derivations.derivation_id =
derivations_by_output_details_set.derivation_id"
(if (null? revision-commits)
"
WHERE"
(string-append (string-append
" "
INNER JOIN guix_revision_package_derivations INNER JOIN guix_revision_package_derivations
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id ON package_derivations.id =
guix_revision_package_derivations.package_derivation_id
INNER JOIN guix_revisions INNER JOIN guix_revisions
ON guix_revisions.id = guix_revision_package_derivations.revision_id ON guix_revisions.id = guix_revision_package_derivations.revision_id
INNER JOIN equivalent_derivations
ON ARRAY[derivation_id] <@ equivalent_derivations.derivation_ids
WHERE guix_revisions.commit IN (" WHERE guix_revisions.commit IN ("
(string-join (map quote-string revision-commits) ",") (string-join (map quote-string revision-commits) ",")
")" ")
)) AND"))
" "
-- TODO: Filter better on what systems and targets build servers use -- TODO: Filter better on what systems and targets build servers use
AND package_derivations.system = 'x86_64-linux' package_derivations.system = 'x86_64-linux'
AND package_derivations.target = 'x86_64-linux' AND package_derivations.target = 'x86_64-linux'
) )
ORDER BY derivation_output_details_set_id, derivations.id
LIMIT 15000")) LIMIT 15000"))
(exec-query conn query)) (exec-query conn query (list (number->string build-server-id))))
(define (fetch-narinfo-files conn build-server-id build-server-url revision-commits) (define (fetch-narinfo-files conn build-server-id build-server-url revision-commits)
(define outputs (define outputs