From a8f6302c2abdfcf19ba9edc651b2df5ac9cb024f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 16 Apr 2024 10:09:51 +0800 Subject: [PATCH 1/2] reduce unnecessary database queries --- models/activities/action_list.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/models/activities/action_list.go b/models/activities/action_list.go index 6e23b173b5abc..38bed576d49cd 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -83,6 +83,9 @@ func (actions ActionList) loadRepoOwner(ctx context.Context, userMap map[int64]* _, alreadyLoaded := userMap[action.Repo.OwnerID] return action.Repo.OwnerID, !alreadyLoaded }) + if len(missingUserIDs) == 0 { + return + } if err := db.GetEngine(ctx). In("id", missingUserIDs). @@ -129,6 +132,9 @@ func (actions ActionList) LoadComments(ctx context.Context) error { commentIDs = append(commentIDs, action.CommentID) } } + if len(commentIDs) == 0 { + return nil + } commentsMap := make(map[int64]*issues_model.Comment, len(commentIDs)) if err := db.GetEngine(ctx).In("id", commentIDs).Find(&commentsMap); err != nil { From 99941dc0fde8359fc99087211f457b69915fad45 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 16 Apr 2024 10:31:19 +0800 Subject: [PATCH 2/2] Fix lint --- models/activities/action_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/activities/action_list.go b/models/activities/action_list.go index 38bed576d49cd..aafb7f8a26c57 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -84,7 +84,7 @@ func (actions ActionList) loadRepoOwner(ctx context.Context, userMap map[int64]* return action.Repo.OwnerID, !alreadyLoaded }) if len(missingUserIDs) == 0 { - return + return nil } if err := db.GetEngine(ctx).