Merge pull request #9672 from Roasbeef/kvdb-sqlite-incremental-vacuum

kvdb/sqlite: enable incremental auto_vacuum on DB creation

Author: Roasbeef

go.mod

@@ -210,6 +210,10 @@ replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 // allows us to specify that as an option.
 replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
 
+replace github.com/lightningnetwork/lnd/sqldb => ./sqldb
+
+replace github.com/lightningnetwork/lnd/kvdb => ./kvdb
+
 // If you change this please also update docs/INSTALL.md and GO_VERSION in
 // Makefile (then run `make lint` to see where else it needs to be updated as
 // well).

go.sum

@@ -371,12 +371,8 @@ github.com/lightningnetwork/lnd/fn/v2 v2.0.8 h1:r2SLz7gZYQPVc3IZhU82M66guz3Zk2oY
 github.com/lightningnetwork/lnd/fn/v2 v2.0.8/go.mod h1:TOzwrhjB/Azw1V7aa8t21ufcQmdsQOQMDtxVOQWNl8s=
 github.com/lightningnetwork/lnd/healthcheck v1.2.6 h1:1sWhqr93GdkWy4+6U7JxBfcyZIE78MhIHTJZfPx7qqI=
 github.com/lightningnetwork/lnd/healthcheck v1.2.6/go.mod h1:Mu02um4CWY/zdTOvFje7WJgJcHyX2zq/FG3MhOAiGaQ=
-github.com/lightningnetwork/lnd/kvdb v1.4.13 h1:fe3sFBxsgcXl16G1zj6O/wZf0hbBHOxFe8pCgmnHZxM=
-github.com/lightningnetwork/lnd/kvdb v1.4.13/go.mod h1:1y0Z81CGQu4SMpcnAie/oK4tzgEqFQqFdj6k3fz2s8s=
 github.com/lightningnetwork/lnd/queue v1.1.1 h1:99ovBlpM9B0FRCGYJo6RSFDlt8/vOkQQZznVb18iNMI=
 github.com/lightningnetwork/lnd/queue v1.1.1/go.mod h1:7A6nC1Qrm32FHuhx/mi1cieAiBZo5O6l8IBIoQxvkz4=
-github.com/lightningnetwork/lnd/sqldb v1.0.8 h1:bTrMwEVDTthkfea+ShdzfK0XkKQz3VNN9dbE+B+gvEk=
-github.com/lightningnetwork/lnd/sqldb v1.0.8/go.mod h1:OG09zL/PHPaBJefp4HsPz2YLUJ+zIQHbpgCtLnOx8I4=
 github.com/lightningnetwork/lnd/ticker v1.1.1 h1:J/b6N2hibFtC7JLV77ULQp++QLtCwT6ijJlbdiZFbSM=
 github.com/lightningnetwork/lnd/ticker v1.1.1/go.mod h1:waPTRAAcwtu7Ji3+3k+u/xH5GHovTsCoSVpho0KDvdA=
 github.com/lightningnetwork/lnd/tlv v1.3.0 h1:exS/KCPEgpOgviIttfiXAPaUqw2rHQrnUOpP7HPBPiY=

kvdb/sqlite/db.go

@@ -24,17 +24,20 @@ const (
 	sqliteTxLockImmediate = "_txlock=immediate"
 )
 
+// pragmaOption holds a key-value pair for a SQLite pragma setting.
+type pragmaOption struct {
+	name  string
+	value string
+}
+
 // NewSqliteBackend returns a db object initialized with the passed backend
 // config. If a sqlite connection cannot be established, then an error is
 // returned.
 func NewSqliteBackend(ctx context.Context, cfg *Config, dbPath, fileName,
 	prefix string) (walletdb.DB, error) {
 
 	// First, we add a set of mandatory pragma options to the query.
-	pragmaOptions := []struct {
-		name  string
-		value string
-	}{
+	pragmaOptions := []pragmaOption{
 		{
 			name: "busy_timeout",
 			value: fmt.Sprintf(
@@ -49,7 +52,12 @@ func NewSqliteBackend(ctx context.Context, cfg *Config, dbPath, fileName,
 			name:  "journal_mode",
 			value: "WAL",
 		},
+		{
+			name:  "auto_vacuum",
+			value: "incremental",
+		},
 	}
+
 	sqliteOptions := make(url.Values)
 	for _, option := range pragmaOptions {
 		sqliteOptions.Add(

sqldb/sqlite.go

@@ -40,6 +40,12 @@ var (
 	_ DB = (*SqliteStore)(nil)
 )
 
+// pragmaOption holds a key-value pair for a SQLite pragma setting.
+type pragmaOption struct {
+	name  string
+	value string
+}
+
 // SqliteStore is a database store implementation that uses a sqlite backend.
 type SqliteStore struct {
 	cfg *SqliteConfig
@@ -53,10 +59,7 @@ func NewSqliteStore(cfg *SqliteConfig, dbPath string) (*SqliteStore, error) {
 	// The set of pragma options are accepted using query options. For now
 	// we only want to ensure that foreign key constraints are properly
 	// enforced.
-	pragmaOptions := []struct {
-		name  string
-		value string
-	}{
+	pragmaOptions := []pragmaOption{
 		{
 			name:  "foreign_keys",
 			value: "on",
@@ -84,6 +87,10 @@ func NewSqliteStore(cfg *SqliteConfig, dbPath string) (*SqliteStore, error) {
 			name:  "fullfsync",
 			value: "true",
 		},
+		{
+			name:  "auto_vacuum",
+			value: "incremental",
+		},
 	}
 	sqliteOptions := make(url.Values)
 	for _, option := range pragmaOptions {