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

Remove the outputs from the query behind the revision derivations

Browse source 
As that data is now unused.
This commit is contained in:
Christopher Baines 2020-01-04 21:20:32 +00:00
parent 04ab01725b
commit e5aca1f317
2 changed files with 4 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -252,39 +252,7 @@ SELECT derivations.file_name,
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 =
derivations_by_output_details_set.derivation_output_details_set_id derivations_by_output_details_set.derivation_output_details_set_id
) AS builds, ) AS builds
(
SELECT
JSON_AGG(
json_build_object(
'output_name', derivation_outputs.name,
'output_path', derivation_output_details.path,
'nars',
(
SELECT JSON_AGG(
json_build_object(
'build_server_id', narinfo_fetch_records.build_server_id,
'hash_algorithm', nars.hash_algorithm,
'hash', nars.hash,
'size', nars.size
)
)
FROM nars
INNER JOIN narinfo_signatures
ON nars.id = narinfo_signatures.nar_id
INNER JOIN narinfo_signature_data
ON narinfo_signature_data.id = narinfo_signatures.narinfo_signature_data_id
INNER JOIN narinfo_fetch_records
ON narinfo_signature_data.id = narinfo_fetch_records.narinfo_signature_data_id
WHERE nars.store_path = derivation_output_details.path
)
)
)
FROM derivation_output_details
INNER JOIN derivation_outputs
ON derivation_output_details.id = derivation_outputs.derivation_output_details_id
WHERE derivation_outputs.derivation_id = derivations.id
) AS outputs
FROM derivations FROM derivations
INNER JOIN derivations_by_output_details_set INNER JOIN derivations_by_output_details_set
ON derivations.id = derivations_by_output_details_set.derivation_id ON derivations.id = derivations_by_output_details_set.derivation_id
@ -313,16 +281,13 @@ ORDER BY derivations.file_name
""))) "")))
(map (match-lambda (map (match-lambda
((file_name system target builds outputs) ((file_name system target builds)
(list file_name (list file_name
system system
target target
(if (string-null? builds) (if (string-null? builds)
#() #()
(json-string->scm builds)) (json-string->scm builds)))))
(if (string-null? outputs)
#()
(json-string->scm outputs)))))
(exec-query conn (exec-query conn
query query
`(,commit-hash `(,commit-hash

2
guix-data-service/web/revision/html.scm
View file

@ -973,7 +973,7 @@ figure {
(tbody (tbody
,@(map ,@(map
(match-lambda (match-lambda
((file-name system target builds outputs) ((file-name system target builds)
`(tr `(tr
(td (a (@ (href ,file-name)) (td (a (@ (href ,file-name))
,(display-store-item-short file-name))) ,(display-store-item-short file-name)))