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

Have branches-by-package-version look at latest processed revision

Browse source 
This means branches aren't omitted if the latest commit hasn't been processed
yet.
This commit is contained in:
Christopher Baines 2021-03-15 10:29:36 +00:00
parent 663bd1411a
commit f47d337a72
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
guix-data-service/model/package.scm
View file

@ -539,7 +539,7 @@ ORDER BY first_datetime DESC, package_version DESC")
(define query (define query
" "
WITH branches AS ( WITH branches AS (
SELECT DISTINCT ON (git_repository_id, name) git_repository_id, name, commit SELECT DISTINCT ON (git_repository_id, name) git_repository_id, name
FROM git_branches FROM git_branches
WHERE commit <> '' WHERE commit <> ''
ORDER BY git_repository_id, name, datetime DESC ORDER BY git_repository_id, name, datetime DESC
@ -552,17 +552,31 @@ SELECT packages.version,
) )
) )
FROM branches FROM branches
INNER JOIN guix_revisions CROSS JOIN LATERAL (
ON branches.git_repository_id = guix_revisions.git_repository_id SELECT guix_revisions.id
AND branches.commit = guix_revisions.commit FROM git_branches
INNER JOIN guix_revisions
ON git_branches.commit = guix_revisions.commit
INNER JOIN load_new_guix_revision_jobs
ON load_new_guix_revision_jobs.commit = guix_revisions.commit
INNER JOIN load_new_guix_revision_job_events
ON job_id = load_new_guix_revision_jobs.id
WHERE guix_revisions.git_repository_id = branches.git_repository_id
AND git_branches.git_repository_id = branches.git_repository_id
AND git_branches.name = branches.name
AND load_new_guix_revision_job_events.event = 'success'
ORDER BY datetime DESC
LIMIT 1
) AS latest_processed_guix_revision
INNER JOIN guix_revision_package_derivations INNER JOIN guix_revision_package_derivations
ON guix_revision_package_derivations.revision_id = guix_revisions.id ON guix_revision_package_derivations.revision_id =
latest_processed_guix_revision.id
INNER JOIN package_derivations INNER JOIN package_derivations
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id ON package_derivations.id = guix_revision_package_derivations.package_derivation_id
AND package_derivations.system = $2 AND package_derivations.system = $2
AND package_derivations.target = $3 AND package_derivations.target = $3
INNER JOIN packages INNER JOIN packages
ON package_derivations.package_id = packages.id ON package_derivations.package_id = packages.id
WHERE packages.name = $1 WHERE packages.name = $1
GROUP BY packages.version GROUP BY packages.version
ORDER BY packages.version DESC") ORDER BY packages.version DESC")