Skip to content

Speed up loading the dashboard on mysql/mariadb (#28546) #28784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Speed up loading the dashboard on mysql/mariadb (#28546) #28784

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
125fdb9
Speed up loading the dashboard on mysql/mariadb (#28546)
lunny Jan 14, 2024
fc5db7d
Merge branch 'release/v1.21' into backport-28546-v1.21
GiteaBot Jan 14, 2024
9ae0572
Merge branch 'release/v1.21' into backport-28546-v1.21
GiteaBot Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Speed up loading the dashboard on mysql/mariadb (#28546) 
Fixes #28155
  • Loading branch information
@lunny @GiteaBot
lunny authored and GiteaBot committed Jan 14, 2024
commit 125fdb986bb396b89f6f01cb242a7bdaa8444ff6
9 changes: 6 additions & 3 deletions models/activities/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,12 @@ func GetFeeds(ctx context.Context, opts GetFeedsOptions) (ActionList, int64, err
return nil, 0, err
}

sess := db.GetEngine(ctx).Where(cond).
Select("`action`.*"). // this line will avoid select other joined table's columns
Join("INNER", "repository", "`repository`.id = `action`.repo_id")
sess := db.GetEngine(ctx).Where(cond)
if setting.Database.Type.IsMySQL() {
sess = sess.IndexHint("USE", "JOIN", "IDX_action_c_u_d")
}
sess = sess.Select("`action`.*"). // this line will avoid select other joined table's columns
Join("INNER", "repository", "`repository`.id = `action`.repo_id")

opts.SetDefaultValues()
sess = db.SetSessionPagination(sess, &opts)
Expand Down