Replace github.com/opencoff/go-sieve with jedisct1/go-sieve-cache

Author: jedisct1

dnscrypt-proxy/plugin_cache.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/jedisct1/go-sieve-cache/pkg/sievecache"
 	"github.com/miekg/dns"
-	sieve "github.com/opencoff/go-sieve"
 )
 
 const StaleResponseTTL = 30 * time.Second
@@ -20,7 +20,7 @@ type CachedResponse struct {
 
 type CachedResponses struct {
 	sync.RWMutex
-	cache *sieve.Sieve[[32]byte, CachedResponse]
+	cache *sievecache.SyncSieveCache[[32]byte, CachedResponse]
 }
 
 var cachedResponses CachedResponses
@@ -150,13 +150,14 @@ func (plugin *PluginCacheResponse) Eval(pluginsState *PluginsState, msg *dns.Msg
 	}
 	cachedResponses.Lock()
 	if cachedResponses.cache == nil {
-		cachedResponses.cache = sieve.New[[32]byte, CachedResponse](pluginsState.cacheSize)
-		if cachedResponses.cache == nil {
+		cache, err := sievecache.NewSync[[32]byte, CachedResponse](pluginsState.cacheSize)
+		if err != nil {
 			cachedResponses.Unlock()
-			return fmt.Errorf("failed to initialize the cache")
+			return fmt.Errorf("failed to initialize the cache: %w", err)
 		}
+		cachedResponses.cache = cache
 	}
-	cachedResponses.cache.Add(cacheKey, cachedResponse)
+	cachedResponses.cache.Insert(cacheKey, cachedResponse)
 	cachedResponses.Unlock()
 	updateTTL(msg, cachedResponse.expiration)
 

go.mod

@@ -20,7 +20,6 @@ require (
 	github.com/kardianos/service v1.2.2
 	github.com/lifenjoiner/dhcpdns v0.0.7
 	github.com/miekg/dns v1.1.66
-	github.com/opencoff/go-sieve v0.3.0
 	github.com/powerman/check v1.8.0
 	github.com/quic-go/quic-go v0.52.0
 	golang.org/x/crypto v0.38.0
@@ -36,6 +35,7 @@ require (
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/hashicorp/go-syslog v1.0.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/jedisct1/go-sieve-cache v0.0.0
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -51,3 +51,5 @@ require (
 	google.golang.org/grpc v1.56.3 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 )
+
+replace github.com/jedisct1/go-sieve-cache => ./tmp/go-sieve

go.sum

@@ -65,8 +65,6 @@ github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
 github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
-github.com/opencoff/go-sieve v0.3.0 h1:G68ZixLqQ5KsIJzUFTFpe7lvL+o+PtyHz2a+EbhUVlo=
-github.com/opencoff/go-sieve v0.3.0/go.mod h1:4o5VwfXUsdua7gnmsxR3py04/L23lSsIWIEgdn1WKBg=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=