Replace cache to use hashicorp/golang-lru/v2 (#1230)

Author: hackerwins

go.mod

@@ -48,6 +48,7 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect

go.sum

@@ -189,6 +189,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

pkg/cache/cache.go

@@ -24,8 +24,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/hashicorp/golang-lru/v2/expirable"
+
 	"github.com/yorkie-team/yorkie/api/types"
-	"github.com/yorkie-team/yorkie/pkg/cache"
 	pkgtypes "github.com/yorkie-team/yorkie/pkg/types"
 	pkgwebhook "github.com/yorkie-team/yorkie/pkg/webhook"
 	"github.com/yorkie-team/yorkie/server/backend/background"
@@ -48,10 +49,7 @@ type Backend struct {
 	Config *Config
 
 	// AuthWebhookCache is used to cache the response of the auth webhook.
-	AuthWebhookCache *cache.LRUExpireCache[string, pkgtypes.Pair[
-		int,
-		*types.AuthWebhookResponse,
-	]]
+	AuthWebhookCache *expirable.LRU[string, pkgtypes.Pair[int, *types.AuthWebhookResponse]]
 	// AuthWebhookClient is used to send auth webhook.
 	AuthWebhookClient *pkgwebhook.Client[types.AuthWebhookRequest, types.AuthWebhookResponse]
 
@@ -99,8 +97,10 @@ func New(
 	}
 
 	// 02. Create the webhook authWebhookCache and client.
-	authWebhookCache := cache.NewLRUExpireCache[string, pkgtypes.Pair[int, *types.AuthWebhookResponse]](
+	authWebhookCache := expirable.NewLRU[string, pkgtypes.Pair[int, *types.AuthWebhookResponse]](
 		conf.AuthWebhookCacheSize,
+		nil,
+		conf.ParseAuthWebhookCacheTTL(),
 	)
 	authWebhookClient := pkgwebhook.NewClient[types.AuthWebhookRequest, types.AuthWebhookResponse](
 		pkgwebhook.Options{

pkg/cache/cache_test.go

@@ -77,7 +77,6 @@ func verifyAccess(
 		be.AuthWebhookCache.Add(
 			cacheKey,
 			pkgtypes.Pair[int, *types.AuthWebhookResponse]{First: status, Second: res},
-			be.Config.ParseAuthWebhookCacheTTL(),
 		)
 	}
 

server/backend/backend.go

@@ -25,14 +25,13 @@ import (
 	"strings"
 
 	"connectrpc.com/connect"
-
-	"github.com/yorkie-team/yorkie/server/rpc/connecthelper"
+	"github.com/hashicorp/golang-lru/v2/expirable"
 
 	"github.com/yorkie-team/yorkie/api/types"
-	"github.com/yorkie-team/yorkie/pkg/cache"
 	"github.com/yorkie-team/yorkie/server/backend"
 	"github.com/yorkie-team/yorkie/server/logging"
 	"github.com/yorkie-team/yorkie/server/projects"
+	"github.com/yorkie-team/yorkie/server/rpc/connecthelper"
 	"github.com/yorkie-team/yorkie/server/rpc/metadata"
 )
 
@@ -45,12 +44,12 @@ func isYorkieService(method string) bool {
 type YorkieServiceInterceptor struct {
 	backend      *backend.Backend
 	requestID    *requestID
-	projectCache *cache.LRUExpireCache[string, *types.Project]
+	projectCache *expirable.LRU[string, *types.Project]
 }
 
 // NewYorkieServiceInterceptor creates a new instance of YorkieServiceInterceptor.
 func NewYorkieServiceInterceptor(be *backend.Backend) *YorkieServiceInterceptor {
-	cache := cache.NewLRUExpireCache[string, *types.Project](be.Config.ProjectCacheSize)
+	cache := expirable.NewLRU[string, *types.Project](be.Config.ProjectCacheSize, nil, be.Config.ParseProjectCacheTTL())
 	return &YorkieServiceInterceptor{
 		backend:      be,
 		requestID:    newRequestID("r"),
@@ -174,7 +173,7 @@ func (i *YorkieServiceInterceptor) buildContext(ctx context.Context, header http
 		if err != nil {
 			return nil, connecthelper.ToStatusError(err)
 		}
-		i.projectCache.Add(cacheKey, prj, i.backend.Config.ParseProjectCacheTTL())
+		i.projectCache.Add(cacheKey, prj)
 	}
 	project, _ := i.projectCache.Get(cacheKey)
 	ctx = projects.With(ctx, project)