filterdb: update for batch filter writes

Author: ellemouton

filterdb/db.go

@@ -53,8 +53,8 @@ type FilterData struct {
 //
 // TODO(roasbeef): similar interface for headerfs?
 type FilterDatabase interface {
-	// PutFilter stores a filter to persistent storage.
-	PutFilter(*FilterData) error
+	// PutFilters stores a set of filters to persistent storage.
+	PutFilters(...*FilterData) error
 
 	// FetchFilter attempts to fetch a filter with the given hash and type
 	// from persistent storage. In the case that a filter matching the
@@ -163,27 +163,46 @@ func putFilter(bucket walletdb.ReadWriteBucket, hash *chainhash.Hash,
 	return bucket.Put(hash[:], bytes)
 }
 
-// PutFilter stores a filter with the given hash and type to persistent
-// storage.
+// PutFilters stores a set of filters to persistent storage.
 //
 // NOTE: This method is a part of the FilterDatabase interface.
-func (f *FilterStore) PutFilter(filterData *FilterData) error {
-	return walletdb.Update(f.db, func(tx walletdb.ReadWriteTx) error {
+func (f *FilterStore) PutFilters(filterList ...*FilterData) error {
+	var updateErr error
+	err := walletdb.Batch(f.db, func(tx walletdb.ReadWriteTx) error {
 		filters := tx.ReadWriteBucket(filterBucket)
+		regularFilterBkt := filters.NestedReadWriteBucket(regBucket)
+
+		for _, filterData := range filterList {
+			var targetBucket walletdb.ReadWriteBucket
+			switch filterData.Type {
+			case RegularFilter:
+				targetBucket = regularFilterBkt
+			default:
+				updateErr = fmt.Errorf("unknown filter "+
+					"type: %v", filterData.Type)
+
+				return nil
+			}
 
-		var targetBucket walletdb.ReadWriteBucket
-		switch filterData.Type {
-		case RegularFilter:
-			targetBucket = filters.NestedReadWriteBucket(regBucket)
-		default:
-			return fmt.Errorf("unknown filter type: %v",
-				filterData.Type)
+			err := putFilter(
+				targetBucket, filterData.BlockHash,
+				filterData.Filter,
+			)
+			if err != nil {
+				return err
+			}
+
+			log.Tracef("Wrote filter for block %s, type %d",
+				&filterData.BlockHash, filterData.Type)
 		}
 
-		return putFilter(
-			targetBucket, filterData.BlockHash, filterData.Filter,
-		)
+		return nil
 	})
+	if err != nil {
+		return err
+	}
+
+	return updateErr
 }
 
 // FetchFilter attempts to fetch a filter with the given hash and type from

filterdb/db_test.go

@@ -92,7 +92,7 @@ func TestFilterStorage(t *testing.T) {
 		Type:      RegularFilter,
 	}
 
-	err = database.PutFilter(filter)
+	err = database.PutFilters(filter)
 	require.NoError(t, err)
 
 	// With the filter stored, we should be able to retrieve the filter

filterdb/log.go

@@ -0,0 +1,26 @@
+package filterdb
+
+import "github.com/btcsuite/btclog"
+
+// log is a logger that is initialized with no output filters.  This
+// means the package will not perform any logging by default until the caller
+// requests it.
+var log btclog.Logger
+
+// The default amount of logging is none.
+func init() {
+	DisableLog()
+}
+
+// DisableLog disables all library log output.  Logging output is disabled
+// by default until either UseLogger or SetLogWriter are called.
+func DisableLog() {
+	UseLogger(btclog.Disabled)
+}
+
+// UseLogger uses a specified Logger to output package logging info.
+// This should be used in preference to SetLogWriter if the caller is also
+// using btclog.
+func UseLogger(logger btclog.Logger) {
+	log = logger
+}

log.go

@@ -8,6 +8,7 @@ import (
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btclog"
 	"github.com/lightninglabs/neutrino/blockntfns"
+	"github.com/lightninglabs/neutrino/filterdb"
 	"github.com/lightninglabs/neutrino/pushtx"
 	"github.com/lightninglabs/neutrino/query"
 )
@@ -41,4 +42,5 @@ func UseLogger(logger btclog.Logger) {
 	pushtx.UseLogger(logger)
 	connmgr.UseLogger(logger)
 	query.UseLogger(logger)
+	filterdb.UseLogger(logger)
 }

query.go

@@ -540,13 +540,10 @@ func (q *cfiltersQuery) handleResponse(req, resp wire.Message,
 			Type:      dbFilterType,
 		}
 
-		err = q.cs.FilterDB.PutFilter(filterData)
+		err = q.cs.FilterDB.PutFilters(filterData)
 		if err != nil {
 			log.Warnf("Couldn't write filter to filterDB: %v", err)
 		}
-
-		log.Tracef("Wrote filter for block %s, type %d",
-			&response.BlockHash, dbFilterType)
 	}
 
 	// We delete the entry for this filter from the headerIndex to indicate