Use transaction for PutMany and cursor Query

base/database/storage/sqlite/sqlite.go

@@ -99,8 +99,15 @@ func (db *SQLite) GetMeta(key string) (*record.Meta, error) {
 
 // Put stores a record in the database.
 func (db *SQLite) Put(r record.Record) (record.Record, error) {
-	r.Lock()
+	return db.putRecord(r, nil)
-	defer r.Unlock()
+}
+
+func (db *SQLite) putRecord(r record.Record, tx *bob.Tx) (record.Record, error) {
+	// Lock record if in a transaction.
+	if tx != nil {
+		r.Lock()
+		defer r.Unlock()
+	}
 
 	// Serialize to JSON.
 	data, err := r.MarshalDataOnly(r, dsd.JSON)
@@ -127,12 +134,19 @@ func (db *SQLite) Put(r record.Record) (record.Record, error) {
 	defer db.lock.Unlock()
 
 	// Simulate upsert with custom selection on conflict.
-	_, err = models.Records.Insert(
+	dbQuery := models.Records.Insert(
 		&setter,
 		im.OnConflict("key").DoUpdate(
 			im.SetExcluded("format", "value", "created", "modified", "expires", "deleted", "secret", "crownjewel"),
 		),
-	).Exec(db.ctx, db.bob)
+	)
+
+	// Execute in transaction or directly.
+	if tx != nil {
+		_, err = dbQuery.Exec(db.ctx, tx)
+	} else {
+		_, err = dbQuery.Exec(db.ctx, db.bob)
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -150,16 +164,39 @@ func (db *SQLite) PutMany(shadowDelete bool) (chan<- record.Record, <-chan error
 	batch := make(chan record.Record, 100)
 	errs := make(chan error, 1)
 
+	tx, err := db.bob.BeginTx(db.ctx, nil)
+	if err != nil {
+		errs <- err
+		return batch, errs
+	}
+
 	// start handler
 	go func() {
-		for r := range batch {
+		// Read all put records.
-			_, err := db.Put(r)
+	writeBatch:
-			if err != nil {
+		for {
-				errs <- err
+			select {
-				return
+			case r := <-batch:
+				if r != nil {
+					// Write record.
+					_, err := db.putRecord(r, &tx)
+					if err != nil {
+						errs <- err
+						break writeBatch
+					}
+				} else {
+					// Finalize transcation.
+					errs <- tx.Commit()
+					return
+				}
+
+			case <-db.ctx.Done():
+				break writeBatch
 			}
 		}
-		errs <- nil
+
+		// Rollback transaction.
+		errs <- tx.Rollback()
 	}()
 
 	return batch, errs
@@ -199,20 +236,25 @@ func (db *SQLite) queryExecutor(queryIter *iterator.Iterator, q *query.Query, lo
 		recordQuery = models.Records.View.Query()
 	}
 
-	// Get all records from query.
+	// Get cursor to go over all records in the query.
-	// TODO: This will load all records into memory. While this is efficient and
-	// will not block others from using the datbase, this might be quite a strain
-	// on the system memory. Monitor and see if this is an issue.
 	db.lock.RLock()
-	records, err := models.RecordsQuery.All(recordQuery, db.ctx, db.bob)
+	cursor, err := models.RecordsQuery.Cursor(recordQuery, db.ctx, db.bob)
 	db.lock.RUnlock()
 	if err != nil {
 		queryIter.Finish(err)
 		return
 	}
+	defer cursor.Close()
 
 recordsLoop:
-	for _, r := range records {
+	for cursor.Next() {
+		// Get next record
+		r, cErr := cursor.Get()
+		if cErr != nil {
+			err = fmt.Errorf("cursor error: %w", cErr)
+			break recordsLoop
+		}
+
 		// Check if key matches.
 		if !q.MatchesKey(r.Key) {
 			continue recordsLoop

base/database/storage/sqlite/sqlite_test.go

@@ -115,17 +115,13 @@ func TestSQLite(t *testing.T) {
 	qZ := &TestRecord{}
 	qZ.SetKey("test:z")
 	qZ.CreateMeta()
-	// put
+	put, errs := db.PutMany(false)
-	_, err = db.Put(qA)
+	put <- qA
-	if err == nil {
+	put <- qB
-		_, err = db.Put(qB)
+	put <- qC
-	}
+	put <- qZ
-	if err == nil {
+	close(put)
-		_, err = db.Put(qC)
+	err = <-errs
-	}
-	if err == nil {
-		_, err = db.Put(qZ)
-	}
 	if err != nil {
 		t.Fatal(err)
 	}

service/core/base/databases.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/safing/portmaster/base/database"
 	_ "github.com/safing/portmaster/base/database/storage/bbolt"
+	_ "github.com/safing/portmaster/base/database/storage/sqlite"
 	"github.com/safing/portmaster/base/dataroot"
 	"github.com/safing/portmaster/base/utils"
 )