diff options
author | Felipe Leopoldo Sologuren GutiƩrrez <fsologureng@users.noreply.github.com> | 2023-01-16 13:21:44 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-16 16:21:44 +0000 |
commit | 04c97aa36473bc0070a2fe46e86dc645dc75ee85 (patch) | |
tree | 409f98cebeaac4b9f8b2482574963c78897710bc /services/repository | |
parent | da274380a7be72e0153a448611278b402e20ad7e (diff) | |
download | gitea-04c97aa36473bc0070a2fe46e86dc645dc75ee85.tar.gz gitea-04c97aa36473bc0070a2fe46e86dc645dc75ee85.zip |
Change use of Walk to WalkDir to improve disk performance (#22462)
As suggest by Go developers, use `filepath.WalkDir` instead of
`filepath.Walk` because [*Walk is less efficient than WalkDir,
introduced in Go 1.16, which avoids calling `os.Lstat` on every file or
directory visited](https://pkg.go.dev/path/filepath#Walk).
This proposition address that, in a similar way as
https://github.com/go-gitea/gitea/pull/22392 did.
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'services/repository')
-rw-r--r-- | services/repository/adopt.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/repository/adopt.go b/services/repository/adopt.go index 93eeb56456..8ebf2b6a3e 100644 --- a/services/repository/adopt.go +++ b/services/repository/adopt.go @@ -303,14 +303,16 @@ func ListUnadoptedRepositories(query string, opts *db.ListOptions) ([]string, in // We're going to iterate by pagesize. root := filepath.Clean(setting.RepoRootPath) - if err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error { + if err := filepath.WalkDir(root, func(path string, d os.DirEntry, err error) error { if err != nil { return err } - if !info.IsDir() || path == root { + if !d.IsDir() || path == root { return nil } + name := d.Name() + if !strings.ContainsRune(path[len(root)+1:], filepath.Separator) { // Got a new user if err = checkUnadoptedRepositories(userName, repoNamesToCheck, unadopted); err != nil { @@ -318,16 +320,14 @@ func ListUnadoptedRepositories(query string, opts *db.ListOptions) ([]string, in } repoNamesToCheck = repoNamesToCheck[:0] - if !globUser.Match(info.Name()) { + if !globUser.Match(name) { return filepath.SkipDir } - userName = info.Name() + userName = name return nil } - name := info.Name() - if !strings.HasSuffix(name, ".git") { return filepath.SkipDir } |