From f65977df3a65e193995c0bdf7069553fd5867fe2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 14 Nov 2023 23:03:56 +0800 Subject: [PATCH] Revert "packages: Calculate package size quota using package creator ID instead of owner ID (#28007)" (#28049) This reverts commit #28007 60522fc96f1fa4675e95010e4b1535e0eac21910. --- models/packages/package_file.go | 12 ------------ services/packages/packages.go | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/models/packages/package_file.go b/models/packages/package_file.go index a2ddae7325..1c2c9ac072 100644 --- a/models/packages/package_file.go +++ b/models/packages/package_file.go @@ -230,15 +230,3 @@ func CalculateFileSize(ctx context.Context, opts *PackageFileSearchOptions) (int Join("INNER", "package_blob", "package_blob.id = package_file.blob_id"). SumInt(new(PackageBlob), "size") } - -// CalculateCreatorPackageQuota sums up all blob sizes related to package -// version creator id. -// It does NOT respect the deduplication of blobs. -func CalculateCreatorPackageQuota(ctx context.Context, creatorID int64) (int64, error) { - return db.GetEngine(ctx). - Table("package_version"). - Where(builder.Eq{"creator_id": creatorID}). - Join("INNER", "package_file", "package_version.id = package_file.version_id"). - Join("INNER", "package_blob", "package_blob.id = package_file.blob_id"). - SumInt(new(PackageBlob), "size") -} diff --git a/services/packages/packages.go b/services/packages/packages.go index 294ee6cc1a..56d5cc04de 100644 --- a/services/packages/packages.go +++ b/services/packages/packages.go @@ -401,7 +401,9 @@ func CheckSizeQuotaExceeded(ctx context.Context, doer, owner *user_model.User, p } if setting.Packages.LimitTotalOwnerSize > -1 { - totalSize, err := packages_model.CalculateCreatorPackageQuota(ctx, doer.ID) + totalSize, err := packages_model.CalculateFileSize(ctx, &packages_model.PackageFileSearchOptions{ + OwnerID: owner.ID, + }) if err != nil { log.Error("CalculateFileSize failed: %v", err) return err