From 92390da7d01bef0bf9b1669e4a0196096d374ab8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 19 Dec 2023 12:19:24 +0800 Subject: [PATCH 1/3] Upgrade xorm to v1.3.5 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 54a56086701c3..ab5bbcfc5b414 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 - xorm.io/xorm v1.3.4 + xorm.io/xorm v1.3.5 ) require ( diff --git a/go.sum b/go.sum index 348fc86da4142..beda84f66cce3 100644 --- a/go.sum +++ b/go.sum @@ -1510,5 +1510,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1: xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo= xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.4 h1:vWFKzR3DhGUDl5b4srhUjhDwjxkZAc4C7BFszpu0swI= -xorm.io/xorm v1.3.4/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= +xorm.io/xorm v1.3.5 h1:cMdszQP8meXLpa7hI4kv9t6AozGNDxqG2qujinGpdsg= +xorm.io/xorm v1.3.5/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= From 9a74d1dd7717d7906e39e8483f380cf515cf7c08 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 20 Dec 2023 11:59:53 +0800 Subject: [PATCH 2/3] Use IndexHint for mysql on action to improvement performance --- go.mod | 2 +- go.sum | 4 ++-- models/activities/action.go | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ab5bbcfc5b414..a1fd652ed5c8f 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 - xorm.io/xorm v1.3.5 + xorm.io/xorm v1.3.5-0.20231219045404-7ae7474bcbf6 ) require ( diff --git a/go.sum b/go.sum index beda84f66cce3..469e6e0d32efc 100644 --- a/go.sum +++ b/go.sum @@ -1510,5 +1510,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1: xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo= xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.5 h1:cMdszQP8meXLpa7hI4kv9t6AozGNDxqG2qujinGpdsg= -xorm.io/xorm v1.3.5/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= +xorm.io/xorm v1.3.5-0.20231219045404-7ae7474bcbf6 h1:1pmm7oRgfzL3HKwCaXaUC6tItJGSlrWXZqh28lFd9K0= +xorm.io/xorm v1.3.5-0.20231219045404-7ae7474bcbf6/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= diff --git a/models/activities/action.go b/models/activities/action.go index 15bd9a52acc5c..c9745e4a8ac63 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -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) From 2cd0bcb97f2b92028a111d4c652d65df7257d17c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 30 Dec 2023 14:35:43 +0800 Subject: [PATCH 3/3] Upgrade xorm --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a1fd652ed5c8f..fadf173ad3316 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 - xorm.io/xorm v1.3.5-0.20231219045404-7ae7474bcbf6 + xorm.io/xorm v1.3.5-0.20231230062844-cc28d9916190 ) require ( diff --git a/go.sum b/go.sum index 469e6e0d32efc..6e7c06978a784 100644 --- a/go.sum +++ b/go.sum @@ -1510,5 +1510,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1: xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo= xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.5-0.20231219045404-7ae7474bcbf6 h1:1pmm7oRgfzL3HKwCaXaUC6tItJGSlrWXZqh28lFd9K0= -xorm.io/xorm v1.3.5-0.20231219045404-7ae7474bcbf6/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo= +xorm.io/xorm v1.3.5-0.20231230062844-cc28d9916190 h1:+iNhcLxfsDDwqr0/0OshHL8ZJeHKaAWvwjvH6f9uVTA= +xorm.io/xorm v1.3.5-0.20231230062844-cc28d9916190/go.mod h1:qFJGFoVYbbIdnz2vaL5OxSQ2raleMpyRRalnq3n9OJo=