core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Speed up loading the dashboard on mysql/mariadb (#28546)" (#29006) (#29007) 

Backport #29006 by @lunny

This reverts commit fa8c3beb26acfcc7e732038c947225857ebcbf31. #28546 
Because it seems performance become worse.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot 2024-02-01 18:58:44 +08:00 committed by GitHub
parent c398c25b18
commit a0b9bd2feb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
models/activities/action.go
View File

@ -446,12 +446,9 @@ func GetFeeds(ctx context.Context, opts GetFeedsOptions) (ActionList, int64, err
return nil, 0, err return nil, 0, err
} }
sess := db.GetEngine(ctx).Where(cond) sess := db.GetEngine(ctx).Where(cond).
if setting.Database.Type.IsMySQL() { Select("`action`.*"). // this line will avoid select other joined table's columns
sess = sess.IndexHint("USE", "JOIN", "IDX_action_c_u_d") Join("INNER", "repository", "`repository`.id = `action`.repo_id")
}
sess = sess.Select("`action`.*"). // this line will avoid select other joined table's columns
Join("INNER", "repository", "`repository`.id = `action`.repo_id")
opts.SetDefaultValues() opts.SetDefaultValues()
sess = db.SetSessionPagination(sess, &opts) sess = db.SetSessionPagination(sess, &opts)