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

Just update the package derivation entries that need updating

Browse source 
Previously, all the entries for the branch were deleted, but not, only the
entries for the branch, that are present in the revision that was loaded will
be deleted. This is more efficient, as it avoids deleting and recreating
entries in the table that shouldn't have changed.
This commit is contained in:
Christopher Baines 2019-11-24 13:37:57 +00:00
parent 5663235048
commit 78695c46a1
1 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -957,7 +957,10 @@ ORDER BY packages.name, packages.version"
#t) #t)
(define (update-package-derivations-table conn git-repository-id commit) (define (update-package-derivations-table conn
git-repository-id
guix-revision-id
commit)
;; Lock the table to wait for other transactions to commit before updating ;; Lock the table to wait for other transactions to commit before updating
;; the table ;; the table
(exec-query (exec-query
@ -976,9 +979,18 @@ LOCK TABLE ONLY package_derivations_by_guix_revision_range
conn conn
" "
DELETE FROM package_derivations_by_guix_revision_range DELETE FROM package_derivations_by_guix_revision_range
WHERE git_repository_id = $1 AND branch_name = $2" WHERE git_repository_id = $1 AND
branch_name = $2 AND
derivation_id IN (
SELECT package_derivations.derivation_id
FROM package_derivations
INNER JOIN guix_revision_package_derivations
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id
WHERE revision_id = $3
)"
(list git-repository-id (list git-repository-id
branch-name)))) branch-name
guix-revision-id))))
(log-time (log-time
(simple-format #f "inserting package derivation entries for ~A" branch-name) (simple-format #f "inserting package derivation entries for ~A" branch-name)
(lambda () (lambda ()
@ -1011,14 +1023,21 @@ INNER JOIN (
) AS revision_packages ON packages.id = revision_packages.package_id ) AS revision_packages ON packages.id = revision_packages.package_id
INNER JOIN guix_revisions ON revision_packages.revision_id = guix_revisions.id INNER JOIN guix_revisions ON revision_packages.revision_id = guix_revisions.id
INNER JOIN git_branches ON guix_revisions.commit = git_branches.commit INNER JOIN git_branches ON guix_revisions.commit = git_branches.commit
WHERE git_branches.name = $2 WHERE git_branches.name = $2 AND
revision_packages.derivation_id IN (
SELECT package_derivations.derivation_id
FROM package_derivations
INNER JOIN guix_revision_package_derivations
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id
WHERE revision_id = $3
)
WINDOW package_version AS ( WINDOW package_version AS (
PARTITION BY packages.name, packages.version, revision_packages.derivation_id PARTITION BY packages.name, packages.version, revision_packages.derivation_id
ORDER BY git_branches.datetime ORDER BY git_branches.datetime
RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
) )
ORDER BY packages.name, packages.version" ORDER BY packages.name, packages.version"
(list git-repository-id branch-name)))))) (list git-repository-id branch-name guix-revision-id))))))
(exec-query (exec-query
conn conn
"SELECT name FROM git_branches WHERE commit = $1 AND git_repository_id = $2" "SELECT name FROM git_branches WHERE commit = $1 AND git_repository_id = $2"
@ -1060,7 +1079,10 @@ ORDER BY packages.name, packages.version"
(extract-information-from conn guix-revision-id (extract-information-from conn guix-revision-id
commit store-item) commit store-item)
(update-package-versions-table conn git-repository-id commit) (update-package-versions-table conn git-repository-id commit)
(update-package-derivations-table conn git-repository-id commit))) (update-package-derivations-table conn
git-repository-id
guix-revision-id
commit)))
(begin (begin
(simple-format #t "Failed to generate store item for ~A\n" (simple-format #t "Failed to generate store item for ~A\n"
commit) commit)