fix(otter): multiple instances (#29)

darkweak · web-flow · commit 00c53d61ea8b · 2025-03-29T13:45:05.000+01:00
* fix(otter): multiple instances

* feat(version): bump to v0.0.14
diff --git a/badger/caddy/go.mod b/badger/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/badger v0.0.13
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/badger v0.0.14
+	github.com/darkweak/storages/core v0.0.14
 )
 
 require (
diff --git a/badger/go.mod b/badger/go.mod
@@ -4,7 +4,7 @@ go 1.22.1
 
 require (
 	dario.cat/mergo v1.0.1
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/dgraph-io/badger/v3 v3.2103.5
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.uber.org/zap v1.27.0
diff --git a/etcd/caddy/go.mod b/etcd/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/etcd v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/etcd v0.0.14
 )
 
 require (
diff --git a/etcd/go.mod b/etcd/go.mod
@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/storages/core => ../core
 
 require (
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.etcd.io/etcd/client/v3 v3.5.18
 	go.uber.org/zap v1.27.0
diff --git a/go-redis/caddy/go.mod b/go-redis/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/go-redis v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/go-redis v0.0.14
 )
 
 require (
diff --git a/go-redis/go.mod b/go-redis/go.mod
@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/storages/core => ../core
 
 require (
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/pierrec/lz4/v4 v4.1.22
 	github.com/redis/go-redis/v9 v9.7.1
 	go.uber.org/zap v1.27.0
diff --git a/nats/caddy/go.mod b/nats/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/nats v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/nats v0.0.14
 )
 
 require (
diff --git a/nats/go.mod b/nats/go.mod
@@ -6,7 +6,7 @@ replace github.com/darkweak/storages/core => ../core
 
 require (
 	dario.cat/mergo v1.0.0
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/nats-io/nats.go v1.39.1
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.uber.org/zap v1.27.0
diff --git a/nuts/caddy/go.mod b/nuts/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/nuts v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/nuts v0.0.14
 )
 
 require (
diff --git a/nuts/go.mod b/nuts/go.mod
@@ -6,7 +6,7 @@ replace github.com/darkweak/storages/core => ../core
 
 require (
 	dario.cat/mergo v1.0.1
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/nutsdb/nutsdb v1.0.4
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.uber.org/zap v1.27.0
diff --git a/olric/caddy/go.mod b/olric/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/olric v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/olric v0.0.14
 )
 
 require (
diff --git a/olric/go.mod b/olric/go.mod
@@ -6,7 +6,7 @@ replace github.com/darkweak/storages/core => ../core
 
 require (
 	github.com/buraksezer/olric v0.5.7
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.uber.org/zap v1.27.0
 )
diff --git a/otter/caddy/go.mod b/otter/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/otter v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/otter v0.0.14
 )
 
 require (
diff --git a/otter/go.mod b/otter/go.mod
@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/storages/core => ../core
 
 require (
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/maypok86/otter v1.2.4
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.uber.org/zap v1.27.0
diff --git a/otter/otter.go b/otter/otter.go
@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/darkweak/storages/core"
@@ -21,6 +22,8 @@ type Otter struct {
 	logger core.Logger
 }
 
+var instanceMap = sync.Map{}
+
 // Factory function create new Otter instance.
 func Factory(otterCfg core.CacheProvider, logger core.Logger, stale time.Duration) (core.Storer, error) {
 	defaultStorageSize := 10_000
@@ -42,6 +45,16 @@ func Factory(otterCfg core.CacheProvider, logger core.Logger, stale time.Duratio
 		}
 	}
 
+	if instance, ok := instanceMap.Load(defaultStorageSize); ok && instance != nil {
+		cache := instance.(otter.CacheWithVariableTTL[string, []byte])
+
+		return &Otter{
+			cache:  &cache,
+			stale:  stale,
+			logger: logger,
+		}, nil
+	}
+
 	cache, err := otter.MustBuilder[string, []byte](defaultStorageSize).
 		CollectStats().
 		Cost(func(key string, value []byte) uint32 {
@@ -53,6 +66,7 @@ func Factory(otterCfg core.CacheProvider, logger core.Logger, stale time.Duratio
 		logger.Error("Impossible to instantiate the Otter DB.", err)
 	}
 
+	instanceMap.Store(defaultStorageSize, cache)
 	logger.Infof("otter.storage.size %d", defaultStorageSize)
 
 	return &Otter{cache: &cache, logger: logger, stale: stale}, nil
diff --git a/redis/caddy/go.mod b/redis/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/redis v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/redis v0.0.14
 )
 
 require (
diff --git a/redis/go.mod b/redis/go.mod
@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/storages/core => ../core
 
 require (
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/pierrec/lz4/v4 v4.1.22
 	github.com/redis/rueidis v1.0.54
 	go.uber.org/zap v1.27.0
diff --git a/simplefs/caddy/go.mod b/simplefs/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.13
-	github.com/darkweak/storages/simplefs v0.0.13
+	github.com/darkweak/storages/core v0.0.14
+	github.com/darkweak/storages/simplefs v0.0.14
 )
 
 require (
diff --git a/simplefs/go.mod b/simplefs/go.mod
@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/storages/core => ../core
 
 require (
-	github.com/darkweak/storages/core v0.0.13
+	github.com/darkweak/storages/core v0.0.14
 	github.com/dustin/go-humanize v1.0.1
 	github.com/jellydator/ttlcache/v3 v3.3.0
 	github.com/pierrec/lz4/v4 v4.1.22

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ go 1.22.1`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/caddyserver/caddy/v2 v2.8.4`
`7`		`- github.com/darkweak/storages/badger v0.0.13`
`8`		`- github.com/darkweak/storages/core v0.0.13`
	`7`	`+ github.com/darkweak/storages/badger v0.0.14`
	`8`	`+ github.com/darkweak/storages/core v0.0.14`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`require (`