From 818f38b8111b29a2883c791283d5918300e17d15 Mon Sep 17 00:00:00 2001
From: Denis Kirillov <denis@nspcc.ru>
Date: Mon, 8 Nov 2021 16:28:28 +0300
Subject: [PATCH] [#38] Replace gcache with golang-lru

Signed-off-by: Denis Kirillov <denis@nspcc.ru>
---
 go.mod               |   3 ++-
 go.sum               | Bin 46195 -> 46028 bytes
 pool/cache.go        |  36 +++++++++++++++---------------------
 pool/pool.go         |   5 ++++-
 pool/pool_test.go    |  12 +++++++-----
 pool/sampler_test.go |   5 ++++-
 6 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/go.mod b/go.mod
index 91beb9b..3cc26de 100644
--- a/go.mod
+++ b/go.mod
@@ -4,13 +4,14 @@ go 1.16
 
 require (
 	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521073959-f0d4d129b7f1
-	github.com/bluele/gcache v0.0.2
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.2.0
+	github.com/hashicorp/golang-lru v0.5.4
 	github.com/mr-tron/base58 v1.2.0
 	github.com/nspcc-dev/hrw v1.0.9
 	github.com/nspcc-dev/neo-go v0.96.1
 	github.com/nspcc-dev/neofs-api-go v1.30.0
+	github.com/nspcc-dev/neofs-crypto v0.3.0
 	github.com/stretchr/testify v1.7.0
 	go.uber.org/zap v1.18.1
 	google.golang.org/grpc v1.41.0
diff --git a/go.sum b/go.sum
index 773a7df52ccff1c4f5be592c0a2504ae9a13e5a3..c54d7747e9773e2b212f1823bf263f5fae160e15 100644
GIT binary patch
delta 18
acmezTg6Yh2rVZP8C+`>J*qqA8w+sMVy$DMH

delta 173
zcmX@}oayrmrVZP8>vKv|b5ixwlM|COQWeS!^bGWj6fz90!jqHIQX)K^)6L!WUEG~A
z3<KQKk~534!~Fxpw95?4%`4pu3xX?+UEIrUxzaOBGD?&5lJj%*ldzblpPsLmo1X$Q
zHrLS9J51ZvIjf+gJUF1jJ44DpBQW35EikMk)GaF{EIZlQ!y@0HL_e*-VDdddvCaE<
H`IZ3ycy&7U

diff --git a/pool/cache.go b/pool/cache.go
index 39e56b8..8b9342a 100644
--- a/pool/cache.go
+++ b/pool/cache.go
@@ -3,44 +3,38 @@ package pool
 import (
 	"strings"
 
-	"github.com/bluele/gcache"
-	"github.com/nspcc-dev/neofs-api-go/pkg/session"
+	lru "github.com/hashicorp/golang-lru"
+	"github.com/nspcc-dev/neofs-sdk-go/session"
 )
 
 type SessionCache struct {
-	cache gcache.Cache
+	cache *lru.Cache
 }
 
-func NewCache() *SessionCache {
-	return &SessionCache{
-		cache: gcache.New(100).Build(),
+func NewCache() (*SessionCache, error) {
+	cache, err := lru.New(100)
+	if err != nil {
+		return nil, err
 	}
+
+	return &SessionCache{cache: cache}, nil
 }
 
 func (c *SessionCache) Get(key string) *session.Token {
-	tokenRaw, err := c.cache.Get(key)
-	if err != nil {
-		return nil
-	}
-	token, ok := tokenRaw.(*session.Token)
+	tokenRaw, ok := c.cache.Get(key)
 	if !ok {
 		return nil
 	}
-
-	return token
+	return tokenRaw.(*session.Token)
 }
 
-func (c *SessionCache) Put(key string, token *session.Token) error {
-	return c.cache.Set(key, token)
+func (c *SessionCache) Put(key string, token *session.Token) bool {
+	return c.cache.Add(key, token)
 }
 
 func (c *SessionCache) DeleteByPrefix(prefix string) {
-	for _, key := range c.cache.Keys(false) {
-		keyStr, ok := key.(string)
-		if !ok {
-			continue
-		}
-		if strings.HasPrefix(keyStr, prefix) {
+	for _, key := range c.cache.Keys() {
+		if strings.HasPrefix(key.(string), prefix) {
 			c.cache.Remove(key)
 		}
 	}
diff --git a/pool/pool.go b/pool/pool.go
index cea77cd..a45c096 100644
--- a/pool/pool.go
+++ b/pool/pool.go
@@ -142,7 +142,10 @@ type pool struct {
 }
 
 func newPool(ctx context.Context, options *BuilderOptions) (Pool, error) {
-	cache := NewCache()
+	cache, err := NewCache()
+	if err != nil {
+		return nil, fmt.Errorf("couldn't create cache: %w", err)
+	}
 
 	clientPacks := make([]*clientPack, len(options.weights))
 	var atLeastOneHealthy bool
diff --git a/pool/pool_test.go b/pool/pool_test.go
index 0cf7054..bd54452 100644
--- a/pool/pool_test.go
+++ b/pool/pool_test.go
@@ -309,7 +309,6 @@ func TestTwoFailed(t *testing.T) {
 
 func TestSessionCache(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
 
 	var tokens []*session.Token
 	clientBuilder := func(opts ...client.Option) (client.Client, error) {
@@ -337,8 +336,9 @@ func TestSessionCache(t *testing.T) {
 	pb.AddNode("peer0", 1)
 
 	opts := &BuilderOptions{
-		Key:           &key.PrivateKey,
-		clientBuilder: clientBuilder,
+		Key:                     &key.PrivateKey,
+		clientBuilder:           clientBuilder,
+		ClientRebalanceInterval: 30 * time.Second,
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -371,7 +371,6 @@ func TestSessionCache(t *testing.T) {
 
 func TestSessionCacheWithKey(t *testing.T) {
 	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
 
 	var tokens []*session.Token
 	clientBuilder := func(opts ...client.Option) (client.Client, error) {
@@ -439,6 +438,9 @@ func TestWaitPresence(t *testing.T) {
 	key, err := keys.NewPrivateKey()
 	require.NoError(t, err)
 
+	cache, err := NewCache()
+	require.NoError(t, err)
+
 	p := &pool{
 		sampler: NewSampler([]float64{1}, rand.NewSource(0)),
 		clientPacks: []*clientPack{{
@@ -446,7 +448,7 @@ func TestWaitPresence(t *testing.T) {
 			healthy: true,
 		}},
 		key:   &key.PrivateKey,
-		cache: NewCache(),
+		cache: cache,
 	}
 
 	t.Run("context canceled", func(t *testing.T) {
diff --git a/pool/sampler_test.go b/pool/sampler_test.go
index e71b559..bc8896c 100644
--- a/pool/sampler_test.go
+++ b/pool/sampler_test.go
@@ -77,12 +77,15 @@ func TestHealthyReweight(t *testing.T) {
 	key, err := keys.NewPrivateKey()
 	require.NoError(t, err)
 
+	cache, err := NewCache()
+	require.NoError(t, err)
+
 	p := &pool{
 		sampler: NewSampler(weights, rand.NewSource(0)),
 		clientPacks: []*clientPack{
 			{client: newNetmapMock(names[0], true), healthy: true, address: "address0"},
 			{client: newNetmapMock(names[1], false), healthy: true, address: "address1"}},
-		cache: NewCache(),
+		cache: cache,
 		key:   &key.PrivateKey,
 	}