From patchwork Sat Apr 6 20:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojtek Kosior X-Patchwork-Id: 62784 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 66FA827BBE9; Sat, 6 Apr 2024 22:00:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F5FD27BBE2 for ; Sat, 6 Apr 2024 22:00:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtD8X-0006Pk-6w; Sat, 06 Apr 2024 16:59:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtCnV-0001gP-Oo for guix-patches@gnu.org; Sat, 06 Apr 2024 16:37:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtCnV-0003Md-Fo; Sat, 06 Apr 2024 16:37:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtCna-0005o6-0L; Sat, 06 Apr 2024 16:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70245] [PATCH 1/2] scripts: system: Rename `sqlite-register'. Resent-From: Wojtek Kosior Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 20:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70245 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70245@debbugs.gnu.org Cc: Wojtek Kosior , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 70245-submit@debbugs.gnu.org id=B70245.171243587022221 (code B ref 70245); Sat, 06 Apr 2024 20:38:01 +0000 Received: (at 70245) by debbugs.gnu.org; 6 Apr 2024 20:37:50 +0000 Received: from localhost ([127.0.0.1]:41047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnM-0005m8-T8 for submit@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:49 -0400 Received: from koszko.org ([93.95.227.159]:49040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnL-0005m0-37 for 70245@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=koszko.org; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Q0SRyun80Lde5mN1XAdiXJbpDbMznnG5J8dbBZ0eWvk=; b=blxETsTeemjIVKuSI2Yx5ERHha 288+mdBeQkNTg6s6ATdvIx2szlx90TgQdkKWCT4Dru8ifu7LpZpTHhSkOhrqCalzaADW70Gxc4peN yXCdCYzVKvPZtLKZG/zxFGB5pvWaBiORsgistorjR8JEuPiJ7qrQxA586C7R9VMc7gJY6S0fSitqV WH5Q5K14drWgY+9NRiMr371gh4X/4tcjTlqYZwmZzBNGCSIgSJ2MPhYdZWf3hyxKDr46xKuc1ApI9 dSFqygyoeLeoKwUsW1V4TVSdXOQr+zLdvX2M/pI7hUz+DDmq1ligkeM8N9eP8ASbzey5DzHnBcJfP AwHcU9k5JpWgXG05b16wtxwwzgQp2fT2MJrqYjW7ByD4dz9bGDR6D8DRbKt3hcUd54UfCylnr/hD/ 3RMGkcPZAzF1ROgUGcrAd78AIbcTVScf6bNMHHn/x+IANsApPIcx0ijdU+/9ra3BcozHh6XsoIYoS J8UBMx7qmfcJqPk+dS8bh6pXWYmFo7TllNSljTwFZt04wRBqQd3QKMIIwiPNyWIqTiF3czKL1xBV5 65Pa5dz7GbE6xFR03pv7Ydqxt/Uq5ygw/u4FJhwuu23CBYPgBdCw/QG9OqnI0Vl8+6kCAEVtZLEVS J0FMe0nNGpC1ahAzBuyqFkxZf0B42k+MLiw2PDyL8=; Received: from 78-11-235-220.static.ip.netia.com.pl ([78.11.235.220] helo=localhost.localdomain) by koszko.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1rtCnD-00005T-35; Sat, 06 Apr 2024 22:37:40 +0200 Date: Sat, 6 Apr 2024 22:37:07 +0200 Message-ID: <56efa64d914f75e8bb147b1f4b46bb1f21efc78b.1712435265.git.koszko@koszko.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 06 Apr 2024 16:59:40 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Wojtek Kosior X-ACL-Warn: , Wojtek Kosior via Guix-patches X-Patchwork-Original-From: Wojtek Kosior via Guix-patches via From: Wojtek Kosior Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Sat Apr 6 20:37:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wojtek Kosior X-Patchwork-Id: 62785 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7B68727BBEA; Sat, 6 Apr 2024 22:00:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 10F4E27BBE2 for ; Sat, 6 Apr 2024 22:00:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtD8X-0006PL-6j; Sat, 06 Apr 2024 16:59:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtCnW-0001gZ-EN for guix-patches@gnu.org; Sat, 06 Apr 2024 16:37:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtCnW-0003Mn-5p; Sat, 06 Apr 2024 16:37:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtCna-0005oE-Dn; Sat, 06 Apr 2024 16:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70245] [PATCH 2/2] store: database: Use correct function name in assertion. Resent-From: Wojtek Kosior Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 06 Apr 2024 20:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70245 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70245@debbugs.gnu.org Cc: Wojtek Kosior , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 70245-submit@debbugs.gnu.org id=B70245.171243587522270 (code B ref 70245); Sat, 06 Apr 2024 20:38:02 +0000 Received: (at 70245) by debbugs.gnu.org; 6 Apr 2024 20:37:55 +0000 Received: from localhost ([127.0.0.1]:41051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnS-0005n7-RB for submit@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:55 -0400 Received: from koszko.org ([93.95.227.159]:49042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtCnN-0005mG-KC for 70245@debbugs.gnu.org; Sat, 06 Apr 2024 16:37:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=koszko.org; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=FBvqV++nfaDEVLp+hFpTREUfLZZbSw5Ovhe3Hj3wVTQ=; b=HSGxHpeA/NBwqsYziF4HfyDXNH a8KrCQY1grNLoyl4wJf6G1t53pJT/ZnSpTP3kJzckcVtlBrBi1cgEN4loMiY1lTtsXHdZa4wnYrEI hjX1OM2NOZm2/g1HLi9OJZ3LYSTPNUrn+mRJw7Ik49r8+Q0qwRh9eTMW6WHiG2uYWMbSRzhtZmgom GjQm2SmVJz+erhaUf6SFKIb2BDQ2PaeMMCGYj5Vx2Tw1VDLl9jhFCZtuMBNNy4RjMCeK5HvKMdqps Pc409VW1XsKdMUdJ3whDVXVOGWBD9DAMAAfM5zLHJAFrQ1sZ+iRuhXa5yqsDbsCjoFI06MTQ6pZB2 X4DBgGSkf88QGd9ehWtqOZbohGZHmvSePnan1ZieJQCKuVLRSjsb8lG0cJLjepzHcWeCVw3ouVbMv BDKJEUfRwgE/uPIf2yfHOw+6NC3/nbcgFhlBo2rvHaJvlYG3yDd+/nBIGExJVdl7ukr08zKz8hpfJ h7MDuRK5ufaF43d04dONqmt9bZuX/HrsDRMKdFq0o2eTURRWcY156KH+5LpRb6Uhq76+Pa/sVlT7q n1PHABYfSCETyUETe9ERVOBpqabnL9G3APs9hlF3QLErN+Cfi9b5JHoDkoDhl8pU23Mdwbj0aMXXD Dopg5+jhFN9r5YLJxP9yO9a0+DmZeenBrMlcGtcwk=; Received: from 78-11-235-220.static.ip.netia.com.pl ([78.11.235.220] helo=localhost.localdomain) by koszko.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1rtCnG-00005T-1a; Sat, 06 Apr 2024 22:37:42 +0200 Date: Sat, 6 Apr 2024 22:37:08 +0200 Message-ID: <7ccff5eb36b8ffe0713660f843165677447e1023.1712435265.git.koszko@koszko.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 06 Apr 2024 16:59:40 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Wojtek Kosior X-ACL-Warn: , Wojtek Kosior via Guix-patches X-Patchwork-Original-From: Wojtek Kosior via Guix-patches via From: Wojtek Kosior Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))