refactor: improve local cache

* feat(xgolanglru): improve

* feat(xgolanglru): improve2

* feat(xgolanglru): improve test

* feat(xgolanglru): improve test

---------

Co-authored-by: 彭业昌 <refrain@douyu.tv>

Author: PengYechang

pkg/cache/xfreecache/v2/cache.go

@@ -46,17 +46,16 @@ func (l *localStorage[K, V]) SetCacheMapOrigin(key string, idsNone []K, fn func(
 
 	// 执行函数
 	resMap, err := fn(idsNone)
-	if err != nil {
-		xlog.Jupiter().Error("GetAndSetCacheMap doMap", append(args, zap.Error(err))...)
-		return
-	}
-
-	// 填入返回中
+	// 先填入返回值，再判断错误返回
 	if v != nil {
 		for k, value := range resMap {
 			v[k] = value
 		}
 	}
+	if err != nil {
+		xlog.Jupiter().Error("GetAndSetCacheMap doMap", append(args, zap.Error(err))...)
+		return
+	}
 
 	// 写入缓存
 	for _, id := range idsNone {

pkg/cache/xfreecache/v2/cache_test.go

@@ -2,6 +2,7 @@ package xfreecache
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	helloworldv1 "github.com/douyu/jupiter/proto/helloworld/v1"
 	"testing"
@@ -257,3 +258,67 @@ func TestStdConfig(t *testing.T) {
 	})
 
 }
+
+func TestGetAndSetDataWithError(t *testing.T) {
+	var configStr = `
+		[jupiter.cache]
+			size = "128m"
+			[jupiter.cache.test1]
+				expire = "60s"
+	`
+	assert.Nil(t, conf.LoadFromReader(bytes.NewBufferString(configStr), toml.Unmarshal))
+
+	for i := 1; i <= 1; i++ {
+		oneCache := StdNew[string, *helloworldv1.SayHiRequest](fmt.Sprintf("test%d", i))
+		missCount := 0
+
+		tests := []struct {
+			stu *helloworldv1.SayHiRequest
+		}{
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 1",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 2",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 1",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 3",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 2",
+				},
+			},
+			{
+				stu: nil,
+			},
+			{
+				stu: nil,
+			},
+		}
+
+		for _, tt := range tests {
+			key := "errTest" + tt.stu.GetName()
+			result, _ := oneCache.GetAndSetCacheData(key, tt.stu.GetName(), func() (*helloworldv1.SayHiRequest, error) {
+				missCount++
+				fmt.Println("local cache miss hit")
+				return tt.stu, errors.New("this is a test error")
+			})
+			fmt.Println(result)
+			assert.Equalf(t, tt.stu.GetName(), result.GetName(), "GetAndSetCacheData(%v) cache value error", key)
+		}
+		// 因为接口报错了，所以全部没有命中缓存
+		assert.Equalf(t, missCount, 7, "GetAndSetCacheData miss count error")
+	}
+}

pkg/cache/xgolanglru/cache.go

@@ -53,17 +53,16 @@ func (l *localStorage[K, V]) SetCacheMapOrigin(key string, idsNone []K, fn func(
 
 	// 执行函数
 	resMap, err := fn(idsNone)
-	if err != nil {
-		xlog.Jupiter().Error("setCacheMap doMap", append(args, zap.Error(err))...)
-		return
-	}
-
-	// 填入返回中
+	// 先填入返回值，再判断错误返回
 	if v != nil {
 		for k, value := range resMap {
 			v[k] = value
 		}
 	}
+	if err != nil {
+		xlog.Jupiter().Error("setCacheMap doMap", append(args, zap.Error(err))...)
+		return
+	}
 
 	// 写入缓存
 	for _, id := range idsNone {

pkg/cache/xgolanglru/cache_test.go

@@ -2,6 +2,7 @@ package xgolanglru
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	helloworldv1 "github.com/douyu/jupiter/proto/helloworld/v1"
 	"testing"
@@ -258,3 +259,67 @@ func TestStdConfig(t *testing.T) {
 	})
 
 }
+
+func TestGetAndSetDataWithError(t *testing.T) {
+	var configStr = `
+		[jupiter.cache]
+			size = "128m"
+			[jupiter.cache.test1]
+				expire = "60s"
+	`
+	assert.Nil(t, conf.LoadFromReader(bytes.NewBufferString(configStr), toml.Unmarshal))
+
+	for i := 1; i <= 1; i++ {
+		oneCache := StdNew[string, *helloworldv1.SayHiRequest](fmt.Sprintf("test%d", i))
+		missCount := 0
+
+		tests := []struct {
+			stu *helloworldv1.SayHiRequest
+		}{
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 1",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 2",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 1",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 3",
+				},
+			},
+			{
+				stu: &helloworldv1.SayHiRequest{
+					Name: "Student 2",
+				},
+			},
+			{
+				stu: nil,
+			},
+			{
+				stu: nil,
+			},
+		}
+
+		for _, tt := range tests {
+			key := "errTest" + tt.stu.GetName()
+			result, _ := oneCache.GetAndSetCacheData(key, tt.stu.GetName(), func() (*helloworldv1.SayHiRequest, error) {
+				missCount++
+				fmt.Println("local cache miss hit")
+				return tt.stu, errors.New("this is a test error")
+			})
+			fmt.Println(result)
+			assert.Equalf(t, tt.stu.GetName(), result.GetName(), "GetAndSetCacheData(%v) cache value error", key)
+		}
+		// 因为接口报错了，所以全部没有命中缓存
+		assert.Equalf(t, missCount, 7, "GetAndSetCacheData miss count error")
+	}
+}