[bug#70245] [PATCH 0/2] Finalize renaming of `sqlite-register' (fix `guix system init')

[bug#70245] [PATCH 0/2] Finalize renaming of `sqlite-register' (fix `guix system init')

[Wojtek Kosior via Guix-patches via]

Recently, guix/store/database.scm had function `sqlite-register' renamed but the
old name kept being used elsewhere, causing breakage.

Wojtek Kosior (2):
  scripts: system: Rename `sqlite-register'.
  store: database: Use correct function name in assertion.

 guix/scripts/system.scm | 19 ++++++++++---------
 guix/store/database.scm |  5 +++--
 2 files changed, 13 insertions(+), 11 deletions(-)


base-commit: 7988ca6a480a7648971c06edc0dfb8da6fd0777b
-- 
2.41.0

[bug#70245] [PATCH 1/2] scripts: system: Rename `sqlite-register'.

[Wojtek Kosior via Guix-patches via]

* guix/scripts/system.scm (define-module): #:autoload `register-valid-path'
  instead of `sqlite-register'.
  (copy-item): Call it with the new name.

Change-Id: I24f71f822a5f400a47adee43f61184a4fbcb9741
---
 guix/scripts/system.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index bf3d2f9044..67020a2aab 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -35,7 +35,7 @@ (define-module (guix scripts system)
   #:use-module (guix store)
   #:autoload   (guix base16) (bytevector->base16-string)
   #:autoload   (guix store database)
-               (sqlite-register store-database-file call-with-database)
+               (register-valid-path store-database-file call-with-database)
   #:autoload   (guix build store-copy) (copy-store-item)
   #:use-module (guix describe)
   #:use-module (guix gexp)
@@ -158,14 +158,15 @@ (define* (copy-item item info target db
     (copy-store-item item target
                      #:deduplicate? #t)
 
-    (sqlite-register db
-                     #:path item
-                     #:references (path-info-references info)
-                     #:deriver (path-info-deriver info)
-                     #:hash (string-append
-                             "sha256:"
-                             (bytevector->base16-string (path-info-hash info)))
-                     #:nar-size (path-info-nar-size info))))
+    (register-valid-path db
+                         #:path item
+                         #:references (path-info-references info)
+                         #:deriver (path-info-deriver info)
+                         #:hash (string-append
+                                 "sha256:"
+                                 (bytevector->base16-string
+                                  (path-info-hash info)))
+                         #:nar-size (path-info-nar-size info))))
 
 (define* (copy-closure item target
                        #:key (log-port (current-error-port)))
-- 
2.41.0

[bug#70245] [PATCH 2/2] store: database: Use correct function name in assertion.

[Wojtek Kosior via Guix-patches via]

* guix/store/database.scm (register-valid-path): Replace "sqlite-register"
  with "register-valid-path" as argument to `assert-integer'.

Change-Id: Id93687e90d0a806d715006ca0b2498a1d10cfba6
---
 guix/store/database.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/store/database.scm b/guix/store/database.scm
index 58d3871e85..a847f9d2f0 100644
--- a/guix/store/database.scm
+++ b/guix/store/database.scm
@@ -247,8 +247,9 @@ (define* (register-valid-path db #:key path (references '())
     (time-second time))
 
   ;; Make sure NAR-SIZE is valid.
-  (assert-integer "sqlite-register" positive? #:nar-size nar-size)
-  (assert-integer "sqlite-register" (cut >= <> 0) #:time registration-time)
+  (assert-integer "register-valid-path" positive? #:nar-size nar-size)
+  (assert-integer "register-valid-path" (cut >= <> 0)
+                  #:time registration-time)
 
   (define id
     (let ((existing-id (valid-path-id db path)))
-- 
2.41.0

[bug#70245] [PATCH 0/2] Finalize renaming of `sqlite-register' (fix `guix system init')

[Tomas Volf]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

Hello,

just confirming that this is indeed a problem, I hit this yesterday[0].

Tomas

0: https://github.com/vpsfreecz/vpsadminos/pull/66#issuecomment-2041177372

--
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#70245: [PATCH 0/2] Finalize renaming of `sqlite-register' (fix `guix system init')

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

Wojtek Kosior <koszko@koszko.org> writes:

> Recently, guix/store/database.scm had function `sqlite-register' renamed but the
> old name kept being used elsewhere, causing breakage.
>
> Wojtek Kosior (2):
>   scripts: system: Rename `sqlite-register'.
>   store: database: Use correct function name in assertion.
>
>  guix/scripts/system.scm | 19 ++++++++++---------
>  guix/store/database.scm |  5 +++--
>  2 files changed, 13 insertions(+), 11 deletions(-)

I forgot to update the issue, but I pushed these patches to master as
c3dfb14f9be7479057036d3fe7744828d2c1a31a.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]