Skip to content

Commit cc02db5

Browse files
committed
Revert "packages: Calculate package size quota using package creator ID instead of owner ID (go-gitea#28007)"
This reverts commit 60522fc.
1 parent 48b9d98 commit cc02db5

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

models/packages/package_file.go

-12
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,3 @@ func CalculateFileSize(ctx context.Context, opts *PackageFileSearchOptions) (int
230230
Join("INNER", "package_blob", "package_blob.id = package_file.blob_id").
231231
SumInt(new(PackageBlob), "size")
232232
}
233-
234-
// CalculateCreatorPackageQuota sums up all blob sizes related to package
235-
// version creator id.
236-
// It does NOT respect the deduplication of blobs.
237-
func CalculateCreatorPackageQuota(ctx context.Context, creatorID int64) (int64, error) {
238-
return db.GetEngine(ctx).
239-
Table("package_version").
240-
Where(builder.Eq{"creator_id": creatorID}).
241-
Join("INNER", "package_file", "package_version.id = package_file.version_id").
242-
Join("INNER", "package_blob", "package_blob.id = package_file.blob_id").
243-
SumInt(new(PackageBlob), "size")
244-
}

services/packages/packages.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,9 @@ func CheckSizeQuotaExceeded(ctx context.Context, doer, owner *user_model.User, p
401401
}
402402

403403
if setting.Packages.LimitTotalOwnerSize > -1 {
404-
totalSize, err := packages_model.CalculateCreatorPackageQuota(ctx, doer.ID)
404+
totalSize, err := packages_model.CalculateFileSize(ctx, &packages_model.PackageFileSearchOptions{
405+
OwnerID: owner.ID,
406+
})
405407
if err != nil {
406408
log.Error("CalculateFileSize failed: %v", err)
407409
return err

0 commit comments

Comments
 (0)