Christopher Baines
5ed98343d7
These changes were motivated by switching to a mechanism of loading data that isn't dependent on the big advisory lock that prevents more than one revision from being processed at a time. Since INSERT ... RETURNING id; is used, this can block if another transaction inserts the same data, and then cause an error when that transaction commits. The solution is to use ON CONFLICT DO NOTHING, but you have to handle the case when the INSERT doesn't return an id since the other transaction has inserted it. This commit rewrites insert-missing-data-and-return-all-ids to do as described above, as well as being more efficient in how existing data is detected and to use more vectors. Other utilities for inserting data are added as well.
83 lines
2.8 KiB
Scheme
83 lines
2.8 KiB
Scheme
;;; Guix Data Service -- Information about Guix over time
|
|
;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>
|
|
;;;
|
|
;;; This program is free software: you can redistribute it and/or
|
|
;;; modify it under the terms of the GNU Affero General Public License
|
|
;;; as published by the Free Software Foundation, either version 3 of
|
|
;;; the License, or (at your option) any later version.
|
|
;;;
|
|
;;; This program is distributed in the hope that it will be useful,
|
|
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
;;; Affero General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU Affero General Public
|
|
;;; License along with this program. If not, see
|
|
;;; <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (guix-data-service model package-derivation)
|
|
#:use-module (srfi srfi-1)
|
|
#:use-module (srfi srfi-43)
|
|
#:use-module (ice-9 vlist)
|
|
#:use-module (ice-9 match)
|
|
#:use-module (squee)
|
|
#:use-module (guix-data-service model utils)
|
|
#:use-module (guix-data-service model system)
|
|
#:export (insert-package-derivations
|
|
count-packages-derivations-in-revision))
|
|
|
|
(define (insert-package-derivations conn
|
|
system
|
|
target
|
|
package-ids
|
|
derivation-ids)
|
|
(define system-id
|
|
(system->system-id conn system))
|
|
|
|
(define data-4-tuples
|
|
(vector-fold
|
|
(lambda (_ result package-id derivation-id)
|
|
(if derivation-id
|
|
(cons (list package-id
|
|
derivation-id
|
|
system-id
|
|
target)
|
|
result)
|
|
result))
|
|
'()
|
|
package-ids
|
|
derivation-ids))
|
|
|
|
(if (null? data-4-tuples)
|
|
#()
|
|
(insert-missing-data-and-return-all-ids
|
|
conn
|
|
"package_derivations"
|
|
'(package_id derivation_id system_id target)
|
|
(list->vector
|
|
data-4-tuples))))
|
|
|
|
(define (count-packages-derivations-in-revision conn commit-hash)
|
|
(define query
|
|
"
|
|
SELECT systems.system, package_derivations.target,
|
|
COUNT(DISTINCT package_derivations.derivation_id)
|
|
FROM package_derivations
|
|
INNER JOIN systems ON package_derivations.system_id = systems.id
|
|
WHERE package_derivations.id IN (
|
|
SELECT guix_revision_package_derivations.package_derivation_id
|
|
FROM guix_revision_package_derivations
|
|
INNER JOIN guix_revisions
|
|
ON guix_revision_package_derivations.revision_id = guix_revisions.id
|
|
WHERE guix_revisions.commit = $1
|
|
)
|
|
GROUP BY systems.system, package_derivations.target
|
|
ORDER BY systems.system DESC, package_derivations.target ASC")
|
|
|
|
(map
|
|
(match-lambda
|
|
((system target count)
|
|
(list system
|
|
target
|
|
(string->number count))))
|
|
(exec-query conn query (list commit-hash))))
|