ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

database: Register each store item only once.

Browse source 
Fixes <https://bugs.gnu.org/32600>.
Reported by Leo Famulari.

* guix/store/database.scm (register-items): Check whether TO-REGISTER is
in DB by calling 'path-id',  and skip the reset-timestamps,
registration, and deduplication phases when it is.
This commit is contained in:
Ludovic Courtès 2018-09-23 23:11:30 +02:00
parent f0addd6461
commit bb3b6ccb05
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
guix/store/database.scm
View file

@ -290,18 +290,22 @@ (define to-register
(define real-file-name
(string-append store-dir "/" (basename (store-info-item item))))
(let-values (((hash nar-size) (nar-sha256 real-file-name)))
;; When TO-REGISTER is already registered, skip it. This makes a
;; significant differences when 'register-closures' is called
;; consecutively for overlapping closures such as 'system' and 'bootcfg'.
(unless (path-id db to-register)
(when reset-timestamps?
(reset-timestamps real-file-name))
(sqlite-register db #:path to-register
#:references (store-info-references item)
#:deriver (store-info-deriver item)
#:hash (string-append "sha256:"
(bytevector->base16-string hash))
#:nar-size nar-size
#:time registration-time)
(when deduplicate?
(deduplicate real-file-name hash #:store store-dir))))
(let-values (((hash nar-size) (nar-sha256 real-file-name)))
(sqlite-register db #:path to-register
#:references (store-info-references item)
#:deriver (store-info-deriver item)
#:hash (string-append "sha256:"
(bytevector->base16-string hash))
#:nar-size nar-size
#:time registration-time)
(when deduplicate?
(deduplicate real-file-name hash #:store store-dir)))))
(mkdir-p db-dir)
(parameterize ((sql-schema schema))