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

Fix more cases where equivalent builds were missed

Browse source
This commit is contained in:
Christopher Baines 2019-12-26 23:22:54 +00:00
parent 5163398e54
commit 0e3c28ffbd
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
guix-data-service/model/build.scm
View file

@ -279,9 +279,12 @@ WITH RECURSIVE all_derivations(id, file_name) AS (
) )
SELECT all_derivations.file_name, latest_build_status.status SELECT all_derivations.file_name, latest_build_status.status
FROM all_derivations FROM all_derivations
INNER JOIN derivations_by_output_details_set
ON all_derivations.id = derivations_by_output_details_set.derivation_id
LEFT OUTER JOIN builds LEFT OUTER JOIN builds
ON all_derivations.file_name = builds.derivation_file_name AND ON derivations_by_output_details_set.derivation_output_details_set_id =
builds.build_server_id = $2 builds.derivation_output_details_set_id
AND builds.build_server_id = $2
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status

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

@ -119,7 +119,11 @@ 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_revision_package_derivations.revision_id = guix_revisions.id ON guix_revision_package_derivations.revision_id = guix_revisions.id
LEFT OUTER JOIN builds ON derivations.file_name = builds.derivation_file_name INNER JOIN derivations_by_output_details_set
ON derivations.id = derivations_by_output_details_set.derivation_id
LEFT OUTER JOIN builds
ON derivations_by_output_details_set.derivation_output_details_set_id =
builds.derivation_output_details_set_id
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
@ -1115,8 +1119,11 @@ SELECT
FROM derivations FROM derivations
INNER JOIN package_derivations INNER JOIN package_derivations
ON derivations.id = package_derivations.derivation_id ON derivations.id = package_derivations.derivation_id
INNER JOIN derivations_by_output_details_set
ON derivations.id = derivations_by_output_details_set.derivation_id
LEFT OUTER JOIN builds LEFT OUTER JOIN builds
ON derivations.file_name = builds.derivation_file_name ON derivations.derivation_output_details_set_id =
builds.derivation_output_details_set_id
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status