diff mbox series

[bug#58624,v2] guix gc: Add '--vacuum-database'.

Message ID a68398d3bb3f09e15c1a716d0f4ae822273f87c5.1666294004.git.efraim@flashner.co.il
State New
Headers show
Series [bug#58624,v2] guix gc: Add '--vacuum-database'. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Efraim Flashner Oct. 20, 2022, 7:27 p.m. UTC 
* guix/scripts/gc.scm (show-help, %options): Add '--vacuum-database'.
* guix/store/database.scm (vacuum-database): New procedure.
* doc/guix.texi (Invoking guix gc): Document the option.
---
 doc/guix.texi           | 12 ++++++++++++
 guix/scripts/gc.scm     | 11 +++++++++++
 guix/store/database.scm |  9 ++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)


base-commit: 00ff6f7c399670a76efffb91276dea2633cc130c

Comments

Christopher Baines Nov. 3, 2022, 4:20 p.m. UTC | #1 
Efraim Flashner <efraim@flashner.co.il> writes:

> * guix/scripts/gc.scm (show-help, %options): Add '--vacuum-database'.
> * guix/store/database.scm (vacuum-database): New procedure.
> * doc/guix.texi (Invoking guix gc): Document the option.
> ---
>  doc/guix.texi           | 12 ++++++++++++
>  guix/scripts/gc.scm     | 11 +++++++++++
>  guix/store/database.scm |  9 ++++++++-
>  3 files changed, 31 insertions(+), 1 deletion(-)

I haven't tried this out, but it sounds good to me +1.

Chris
Efraim Flashner Nov. 6, 2022, 12:04 p.m. UTC | #2 
On Thu, Nov 03, 2022 at 05:20:24PM +0100, Christopher Baines wrote:
> 
> Efraim Flashner <efraim@flashner.co.il> writes:
> 
> > * guix/scripts/gc.scm (show-help, %options): Add '--vacuum-database'.
> > * guix/store/database.scm (vacuum-database): New procedure.
> > * doc/guix.texi (Invoking guix gc): Document the option.
> > ---
> >  doc/guix.texi           | 12 ++++++++++++
> >  guix/scripts/gc.scm     | 11 +++++++++++
> >  guix/store/database.scm |  9 ++++++++-
> >  3 files changed, 31 insertions(+), 1 deletion(-)
> 
> I haven't tried this out, but it sounds good to me +1.

Thanks. In the documentation I used overtime vs 'over time' and I had a
double period at the end of the last sentence, which I cleaned up before
pushing.
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index fd8b19fe46..1c13480cbc 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4531,6 +4531,18 @@  Invoking guix gc
 this option is primarily useful when the daemon was running with
 @option{--disable-deduplication}.
 
+@item --vacuum-database
+@cindex vacuum the store database
+@comment Avoid words like 'repair,' 'compress,' and 'optimize.'
+Guix uses an sqlite database to keep track of the items in (@pxref{The Store}).
+Overtime it is possible that the database may grow to a large size and become
+fragmented.  As a result, one may wish to clear the freed space and join the
+partially used pages in the database left behind from removed packages or after
+running the garbage collector.  Running @command{sudo guix gc
+--vacuum-database} will lock the database and @code{VACUUM} the store,
+defragmenting the database and purging freed pages, unlocking the database when
+it finishes..
+
 @end table
 
 @node Invoking guix pull
diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 65cd4bdf8b..5e775c5cdb 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -1,5 +1,6 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012-2013, 2015-2020, 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,6 +28,7 @@  (define-module (guix scripts gc)
                                 generation-number)
   #:autoload   (guix scripts package) (delete-generations)
   #:autoload   (gnu home) (home-generation-base)
+  #:autoload   (guix store database) (vacuum-database)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1)
@@ -86,6 +88,10 @@  (define (show-help)
   (display (G_ "
       --clear-failures   remove PATHS from the set of cached failures"))
   (newline)
+  (display (G_ "
+      --vacuum-database  repack the sqlite database tracking the store
+                         using less space"))
+  (newline)
   (display (G_ "
   -h, --help             display this help and exit"))
   (display (G_ "
@@ -131,6 +137,11 @@  (define %options
                 (lambda args
                   (show-version-and-exit "guix gc")))
 
+        (option '("vacuum-database") #f #f
+                (lambda args
+                  (vacuum-database)
+                  (exit 0)))
+
         (option '(#\C "collect-garbage") #f #t
                 (lambda (opt name arg result)
                   (let ((result (alist-cons 'action 'collect-garbage
diff --git a/guix/store/database.scm b/guix/store/database.scm
index 8d08def833..e664015673 100644
--- a/guix/store/database.scm
+++ b/guix/store/database.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2017, 2019 Caleb Ristvedt <caleb.ristvedt@cune.org>
 ;;; Copyright © 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,7 +46,8 @@  (define-module (guix store database)
             sqlite-register
             register-items
             %epoch
-            reset-timestamps))
+            reset-timestamps
+            vacuum-database))
 
 ;;; Code for working with the store database directly.
 
@@ -438,3 +440,8 @@  (define* (register-items db items
                     (register db item)
                     (report))
                   items)))))
+
+(define (vacuum-database)
+  (let ((db (sqlite-open (store-database-file))))
+    (sqlite-exec db "VACUUM;")
+    (sqlite-close db)))