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

Order build statuses by id, not timestamp

Browse source 
Some builds from Cuirass change status at the same timestamp, so use the id
for ordering instead.
This commit is contained in:
Christopher Baines 2020-03-01 15:57:35 +00:00
parent 3016f0548d
commit b19227c086
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -440,7 +440,7 @@ INNER JOIN builds
LEFT JOIN ( LEFT JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
WHERE builds.build_server_id = $1 AND WHERE builds.build_server_id = $1 AND

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

@ -80,7 +80,7 @@ LEFT JOIN
( (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
" "
@ -167,7 +167,7 @@ INNER JOIN
( (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON latest_build_status.build_id = builds.id ON latest_build_status.build_id = builds.id
" "
@ -206,7 +206,7 @@ INNER JOIN
( (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON latest_build_status.build_id = builds.id ON latest_build_status.build_id = builds.id
INNER JOIN derivations_by_output_details_set INNER JOIN derivations_by_output_details_set
@ -283,7 +283,7 @@ LEFT OUTER JOIN builds
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
WHERE latest_build_status.status = 'failed'") WHERE latest_build_status.status = 'failed'")

2
guix-data-service/model/channel-instance.scm
View file

@ -79,7 +79,7 @@ LEFT OUTER JOIN builds
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
INNER JOIN guix_revisions INNER JOIN guix_revisions

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

@ -159,7 +159,7 @@ LEFT OUTER JOIN build_servers
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
WHERE guix_revisions.commit = $1 WHERE guix_revisions.commit = $1
@ -258,7 +258,7 @@ SELECT derivations.file_name,
INNER JOIN ( INNER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
WHERE builds.derivation_output_details_set_id = WHERE builds.derivation_output_details_set_id =
@ -380,7 +380,7 @@ SELECT derivations.file_name,
INNER JOIN ( INNER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
WHERE builds.derivation_output_details_set_id = WHERE builds.derivation_output_details_set_id =
@ -1388,7 +1388,7 @@ LEFT OUTER JOIN builds
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
WHERE " criteria ";")) WHERE " criteria ";"))

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

@ -290,7 +290,7 @@ LEFT OUTER JOIN builds
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
INNER JOIN guix_revisions AS first_guix_revisions INNER JOIN guix_revisions AS first_guix_revisions

2
guix-data-service/model/system-test.scm
View file

@ -98,7 +98,7 @@ LEFT OUTER JOIN builds
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY build_id, timestamp DESC ORDER BY build_id, id DESC
) AS latest_build_status ) AS latest_build_status
ON builds.id = latest_build_status.build_id ON builds.id = latest_build_status.build_id
INNER JOIN guix_revisions INNER JOIN guix_revisions