From a50ed118c07b2918ba7b702c2b408b33f1d656b5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 21 Feb 2024 23:22:48 +0800 Subject: [PATCH 1/2] small cache when get user id on interation --- services/agit/agit.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/agit/agit.go b/services/agit/agit.go index bc6837257040..6e02f18babd2 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -38,6 +38,8 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git. _, forcePush = opts.GitPushOptions["force-push"] objectFormat, _ := gitRepo.GetObjectFormat() + users := map[int64]*user_model.User{} + for i := range opts.OldCommitIDs { if opts.NewCommitIDs[i] == objectFormat.EmptyObjectID().String() { results = append(results, private.HookProcReceiveRefResult{ @@ -116,9 +118,13 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git. description = opts.GitPushOptions["description"] } - pusher, err := user_model.GetUserByID(ctx, opts.UserID) - if err != nil { - return nil, fmt.Errorf("Failed to get user. Error: %w", err) + pusher, has := users[opts.UserID] + if !has { + pusher, err = user_model.GetUserByID(ctx, opts.UserID) + if err != nil { + return nil, fmt.Errorf("Failed to get user. Error: %w", err) + } + users[opts.UserID] = pusher } prIssue := &issues_model.Issue{ From b0fdba1dd3c342203b1ca812bf53779dd155d756 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 22 Feb 2024 12:23:29 +0800 Subject: [PATCH 2/2] Just load pusher once --- services/agit/agit.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/services/agit/agit.go b/services/agit/agit.go index 6e02f18babd2..75b561581d51 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -38,7 +38,10 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git. _, forcePush = opts.GitPushOptions["force-push"] objectFormat, _ := gitRepo.GetObjectFormat() - users := map[int64]*user_model.User{} + pusher, err := user_model.GetUserByID(ctx, opts.UserID) + if err != nil { + return nil, fmt.Errorf("Failed to get user. Error: %w", err) + } for i := range opts.OldCommitIDs { if opts.NewCommitIDs[i] == objectFormat.EmptyObjectID().String() { @@ -118,15 +121,6 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git. description = opts.GitPushOptions["description"] } - pusher, has := users[opts.UserID] - if !has { - pusher, err = user_model.GetUserByID(ctx, opts.UserID) - if err != nil { - return nil, fmt.Errorf("Failed to get user. Error: %w", err) - } - users[opts.UserID] = pusher - } - prIssue := &issues_model.Issue{ RepoID: repo.ID, Title: title,