Merge pull request #16 from go-eagle/feat/add_singleflight

feat: use singleflight to get data
go-eagle · Nov 14, 2024 · b729c71 · b729c71
2 parents d3b9cfa + 47450f6
commit b729c71
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 100 deletions.
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ all: lint test build
 .PHONY: build
 # make build, Build the binary file
 build: wire
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags ${ldflags} -o bin/$(SERVICE_NAME) cmd/server/main.go cmd/server/wire_gen.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -race -ldflags ${ldflags} -o bin/$(SERVICE_NAME) cmd/server/main.go cmd/server/wire_gen.go
 #	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags ${ldflags} -o bin/$(SERVICE_NAME)-consumer cmd/consumer/main.go cmd/consumer/wire_gen.go
 
 .PHONY: run
@@ -75,7 +75,7 @@ lint:
 .PHONY: test
 # make test
 test: vet
-	@go test -short ${PKG_LIST}
+	@go test -race -short ${PKG_LIST}
 
 .PHONY: vet
 # make vet

diff --git a/api/user/v1/user.pb.go b/api/user/v1/user.pb.go
diff --git a/api/user/v1/user.proto b/api/user/v1/user.proto
@@ -4,6 +4,7 @@ package user.v1;
 
 import "validate/validate.proto";
 import "google/api/annotations.proto";
+import "gogo/protobuf/gogo.proto";
 
 option go_package = "github.com/go-eagle/eagle-layout/api/user/v1;v1";
 
@@ -190,6 +191,7 @@ message GetUserReply {
 
 message BatchGetUsersRequest {
   repeated int64 ids = 1;
+  // int64 ids = 1 [(gogoproto.moretags) = 'form:"ids"'];
 }
 
 message BatchGetUsersReply {

diff --git a/api/user/v1/user_gin.pb.go b/api/user/v1/user_gin.pb.go
diff --git a/cmd/gen/generate.go b/cmd/gen/generate.go
@@ -47,10 +47,13 @@ func main() {
 	dal.Init()
 
 	g := gen.NewGenerator(gen.Config{
-		OutPath:      "./internal/dal/db/dao",                       // 生成的查询类代码的输出路径，默认./query, 这里改为dao
-		ModelPkgPath: "./internal/dal/db/model",                     // 默认情况下会跟随OutPath参数，在同目录下生成model目录
-		Mode:         gen.WithDefaultQuery | gen.WithQueryInterface, // generate mode
-		WithUnitTest: true,                                          // 为生成的查询类代码生成单元测试
+		OutPath:           "./internal/dal/db/dao",                       // 生成的查询类代码的输出路径，默认./query, 这里改为dao
+		ModelPkgPath:      "./internal/dal/db/model",                     // 默认情况下会跟随OutPath参数，在同目录下生成model目录
+		Mode:              gen.WithDefaultQuery | gen.WithQueryInterface, // generate mode
+		WithUnitTest:      true,                                          // 为生成的查询类代码生成单元测试
+		FieldNullable:     true,                                          // 对于数据库中nullable的数据，在生成代码中自动对应为指针类型
+		FieldWithIndexTag: true,                                          // 从数据库同步的表结构代码包含gorm的index tag
+		FieldWithTypeTag:  true,                                          // 同步的表结构代码包含gorm的type tag(数据库中对应数据类型)
 	})
 
 	g.UseDB(dal.DB) // reuse your gorm db

diff --git a/internal/dal/cache/user_cache.go b/internal/dal/cache/user_cache.go
@@ -70,7 +70,7 @@ func (c *userCache) GetUserCache(ctx context.Context, id int64) (data *model.Use
 	cacheKey := c.GetUserCacheKey(id)
 	err = c.cache.Get(ctx, cacheKey, &data)
 	if err != nil && !errors.Is(err, redis.Nil) {
-		log.WithContext(ctx).Warnf("get err from redis, err: %v", err)
+		log.WithContext(ctx).Warnf("[cache] GetUserCache err: %v", err)
 		return nil, err
 	}
 	return data, nil

diff --git a/internal/repository/README.md b/internal/repository/README.md
@@ -19,4 +19,4 @@
             /    |    \
            /     |     \
         db   rpc   cache
-```
+```
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ @@
                 /    |    \
                /     |     \
             db   rpc   cache
-    ```
+    ```