]> source.dussan.org Git - gitea.git/commitdiff
Fix package list performance (#30520)
authorKN4CK3R <admin@oldschoolhack.me>
Sat, 20 Apr 2024 11:07:00 +0000 (13:07 +0200)
committerGitHub <noreply@github.com>
Sat, 20 Apr 2024 11:07:00 +0000 (13:07 +0200)
Fixes #28255

The new query uses the id field to sort by "newer". This most not be
correct (usually it is) but it's faster (see #28255).
If someone has a better idea, please propose changes.

Co-authored-by: Giteabot <teabot@gitea.io>
models/packages/package_version.go

index 505dbaa0a576a78b93d9709b0f2d0fd86f8eb717..278e8e3a86b0ef28b9b72e2446cb1dbff1816804 100644 (file)
@@ -287,9 +287,10 @@ func (opts *PackageSearchOptions) configureOrderBy(e db.Engine) {
 // SearchVersions gets all versions of packages matching the search options
 func SearchVersions(ctx context.Context, opts *PackageSearchOptions) ([]*PackageVersion, int64, error) {
        sess := db.GetEngine(ctx).
-               Where(opts.ToConds()).
+               Select("package_version.*").
                Table("package_version").
-               Join("INNER", "package", "package.id = package_version.package_id")
+               Join("INNER", "package", "package.id = package_version.package_id").
+               Where(opts.ToConds())
 
        opts.configureOrderBy(sess)
 
@@ -304,19 +305,18 @@ func SearchVersions(ctx context.Context, opts *PackageSearchOptions) ([]*Package
 
 // SearchLatestVersions gets the latest version of every package matching the search options
 func SearchLatestVersions(ctx context.Context, opts *PackageSearchOptions) ([]*PackageVersion, int64, error) {
-       cond := opts.ToConds().
-               And(builder.Expr("pv2.id IS NULL"))
-
-       joinCond := builder.Expr("package_version.package_id = pv2.package_id AND (package_version.created_unix < pv2.created_unix OR (package_version.created_unix = pv2.created_unix AND package_version.id < pv2.id))")
-       if opts.IsInternal.Has() {
-               joinCond = joinCond.And(builder.Eq{"pv2.is_internal": opts.IsInternal.Value()})
-       }
+       in := builder.
+               Select("MAX(package_version.id)").
+               From("package_version").
+               InnerJoin("package", "package.id = package_version.package_id").
+               Where(opts.ToConds()).
+               GroupBy("package_version.package_id")
 
        sess := db.GetEngine(ctx).
+               Select("package_version.*").
                Table("package_version").
-               Join("LEFT", "package_version pv2", joinCond).
                Join("INNER", "package", "package.id = package_version.package_id").
-               Where(cond)
+               Where(builder.In("package_version.id", in))
 
        opts.configureOrderBy(sess)