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

Tweak select-output-consistency-for-revision

Browse source 
I don't think this actually changes the result, but I think the query is a bit
better formed.
This commit is contained in:
Christopher Baines 2020-05-03 21:21:39 +01:00
parent c5a5684f1d
commit 2e3276e803
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -318,15 +318,9 @@ FROM (
SELECT derivation_output_details.path, SELECT derivation_output_details.path,
package_derivations.system, package_derivations.system,
package_derivations.target, package_derivations.target,
JSON_AGG(
json_build_object(
'hash', nars.hash,
'build_server_id', narinfo_fetch_records.build_server_id
)
),
CASE CASE
WHEN (COUNT(DISTINCT narinfo_fetch_records.build_server_id) <= 1) THEN NULL WHEN (COUNT(DISTINCT nar_data.build_server_id) <= 1) THEN NULL
ELSE (COUNT(DISTINCT nars.hash) = 1) ELSE (COUNT(DISTINCT nar_data.hash) = 1)
END AS reproducible END AS reproducible
FROM derivation_output_details FROM derivation_output_details
INNER JOIN derivation_outputs INNER JOIN derivation_outputs
@ -335,17 +329,22 @@ FROM (
INNER JOIN package_derivations INNER JOIN package_derivations
ON derivation_outputs.derivation_id = package_derivations.derivation_id ON derivation_outputs.derivation_id = package_derivations.derivation_id
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_revision_package_derivations.revision_id = guix_revisions.id ON guix_revision_package_derivations.revision_id = guix_revisions.id
LEFT JOIN nars LEFT JOIN (
ON derivation_output_details.path = nars.store_path SELECT nars.store_path, narinfo_fetch_records.build_server_id, nars.hash
LEFT JOIN narinfo_signatures FROM nars
ON narinfo_signatures.nar_id = nars.id INNER JOIN narinfo_signatures
LEFT JOIN narinfo_signature_data ON narinfo_signatures.nar_id = nars.id
ON narinfo_signatures.narinfo_signature_data_id = narinfo_signature_data.id INNER JOIN narinfo_signature_data
LEFT JOIN narinfo_fetch_records ON narinfo_signatures.narinfo_signature_data_id = narinfo_signature_data.id
ON narinfo_fetch_records.narinfo_signature_data_id = narinfo_signature_data.id INNER JOIN narinfo_fetch_records
ON narinfo_fetch_records.narinfo_signature_data_id =
narinfo_signature_data.id
) AS nar_data
ON nar_data.store_path = derivation_output_details.path
WHERE derivation_output_details.hash IS NULL AND WHERE derivation_output_details.hash IS NULL AND
guix_revisions.commit = $1 AND guix_revisions.commit = $1 AND
package_derivations.target = '' -- Exclude cross builds package_derivations.target = '' -- Exclude cross builds