futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

database: 'sqlite-register' takes a database, not a file name.

Browse Source 
* guix/store/database.scm (sqlite-register): Remove #:db-file and add
'db' parameter.  Remove #:schema and 'parameterize'.
(register-path): Wrap 'sqlite-register' call in 'with-database' and in
'parameterize'.
* tests/store-database.scm ("new database")
("register-path with unregistered references"): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2018-06-07 21:55:15 +02:00
parent c45477d2a1
commit ef1297e8c7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
guix/store/database.scm
View File

@ -157,21 +157,15 @@ ids of items referred to."
(last-insert-row-id db))
references)))
;; XXX figure out caching of statement and database objects... later
(define* (sqlite-register #:key db-file path (references '())
deriver hash nar-size
(schema (sql-schema)))
"Registers this stuff in a database specified by DB-FILE. PATH is the string
path of some store item, REFERENCES is a list of string paths which the store
item PATH refers to (they need to be already registered!), DERIVER is a string
path of the derivation that created the store item PATH, HASH is the
base16-encoded sha256 hash of the store item denoted by PATH (prefixed with
\"sha256:\") after being converted to nar form, and NAR-SIZE is the size in
bytes of the store item denoted by PATH after being converted to nar form.
(define* (sqlite-register db #:key path (references '())
deriver hash nar-size)
"Registers this stuff in DB. PATH is the store item to register and
REFERENCES is the list of store items PATH refers to; DERIVER is the '.drv'
that produced PATH, HASH is the base16-encoded Nix sha256 hash of
PATH (prefixed with \"sha256:\"), and NAR-SIZE is the size in bytes PATH after
being converted to nar form.
Every store item in REFERENCES must already be registered."
(parameterize ((sql-schema schema))
(with-database db-file db
(let ((id (update-or-insert db #:path path
#:deriver deriver
#:hash hash
@ -180,7 +174,7 @@ Every store item in REFERENCES must already be registered."
;; Call 'path-id' on each of REFERENCES. This ensures we get a
;; "non-NULL constraint" failure if one of REFERENCES is unregistered.
(add-references db id
(map (cut path-id db <>) references))))))
(map (cut path-id db <>) references))))
;;;
@ -267,15 +261,16 @@ be used internally by the daemon's build hook."
(when reset-timestamps?
(reset-timestamps real-path))
(mkdir-p db-dir)
(parameterize ((sql-schema schema))
(with-database (string-append db-dir "/db.sqlite") db
(sqlite-register
#:db-file (string-append db-dir "/db.sqlite")
#:schema schema
db
#:path to-register
#:references references
#:deriver deriver
#:hash (string-append "sha256:"
(bytevector->base16-string hash))
#:nar-size nar-size)
#:nar-size nar-size)))
(when deduplicate?
(deduplicate real-path hash #:store store-dir)))))

12
tests/store-database.scm
View File

@ -57,20 +57,20 @@
(call-with-temporary-output-file
(lambda (db-file port)
(delete-file db-file)
(sqlite-register #:db-file db-file
(with-database db-file db
(sqlite-register db
#:path "/gnu/foo"
#:references '()
#:deriver "/gnu/foo.drv"
#:hash (string-append "sha256:" (make-string 64 #\e))
#:nar-size 1234)
(sqlite-register #:db-file db-file
(sqlite-register db
#:path "/gnu/bar"
#:references '("/gnu/foo")
#:deriver "/gnu/bar.drv"
#:hash (string-append "sha256:" (make-string 64 #\a))
#:nar-size 4321)
(let ((path-id (@@ (guix store database) path-id)))
(with-database db-file db
(list (path-id db "/gnu/foo")
(path-id db "/gnu/bar")))))))
@ -83,12 +83,12 @@
(delete-file db-file)
(catch 'sqlite-error
(lambda ()
(sqlite-register #:db-file db-file
#:path "/gnu/foo"
(with-database db-file db
(sqlite-register db #:path "/gnu/foo"
#:references '("/gnu/bar")
#:deriver "/gnu/foo.drv"
#:hash (string-append "sha256:" (make-string 64 #\e))
#:nar-size 1234)
#:nar-size 1234))
#f)
(lambda args
(pk 'welcome-exception! args)