diff options
| author | Zettat123 <zettat123@gmail.com> | 2023-07-26 15:02:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-26 07:02:53 +0000 |
| commit | f3ed0ef692a2c73fdf491d86f27fad33da742174 (patch) | |
| tree | 83ffdf2ea868a91934c2460665eb6da71316b3e4 /models/git | |
| parent | dcd3a631288686a95cedbd4aa9cce245e896825d (diff) | |
| download | gitea-f3ed0ef692a2c73fdf491d86f27fad33da742174.tar.gz gitea-f3ed0ef692a2c73fdf491d86f27fad33da742174.zip | |
Fix bugs in LFS meta garbage collection (#26122)
This PR
- Fix #26093. Replace `time.Time` with `timeutil.TimeStamp`
- Fix #26135. Add missing `xorm:"extends"` to `CountLFSMetaObject` for
LFS meta object query
- Add a unit test for LFS meta object garbage collection
Diffstat (limited to 'models/git')
| -rw-r--r-- | models/git/lfs.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/models/git/lfs.go b/models/git/lfs.go index 7d3da72a94..e8192f92c5 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go @@ -6,7 +6,6 @@ package git import ( "context" "fmt" - "time" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" @@ -370,8 +369,8 @@ func IterateRepositoryIDsWithLFSMetaObjects(ctx context.Context, f func(ctx cont // IterateLFSMetaObjectsForRepoOptions provides options for IterateLFSMetaObjectsForRepo type IterateLFSMetaObjectsForRepoOptions struct { - OlderThan time.Time - UpdatedLessRecentlyThan time.Time + OlderThan timeutil.TimeStamp + UpdatedLessRecentlyThan timeutil.TimeStamp OrderByUpdated bool LoopFunctionAlwaysUpdates bool } @@ -382,8 +381,8 @@ func IterateLFSMetaObjectsForRepo(ctx context.Context, repoID int64, f func(cont batchSize := setting.Database.IterateBufferSize engine := db.GetEngine(ctx) type CountLFSMetaObject struct { - Count int64 - LFSMetaObject + Count int64 + LFSMetaObject `xorm:"extends"` } id := int64(0) |