MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

xl: Avoid called getdents for folders in listing (#19100)

Browse Source
This commit is contained in:
Anis Eleuch 2024-03-01 17:01:28 +01:00 committed by GitHub
parent 2c2f5d871c
commit 8f03c6e0db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/is-dir-empty_linux.go Normal file
View File

@ -0,0 +1,32 @@
//go:build linux && !appengine
// +build linux,!appengine
// Copyright (c) 2015-2024 MinIO, Inc.
//
// This file is part of MinIO Object Storage stack
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package cmd
import "syscall"
// Returns true if no error and there is no object or prefix inside this directory
func isDirEmpty(dirname string) bool {
var stat syscall.Stat_t
if err := syscall.Stat(dirname, &stat); err != nil {
return false
}
return stat.Mode&syscall.S_IFMT == syscall.S_IFDIR && stat.Nlink < 3
}

30
cmd/is-dir-empty_other.go Normal file
View File

@ -0,0 +1,30 @@
//go:build !linux
// +build !linux
// Copyright (c) 2015-2021 MinIO, Inc.
//
// This file is part of MinIO Object Storage stack
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package cmd
// isDirEmpty - returns true if there is no error and no object and prefix inside this directory
func isDirEmpty(dirname string) bool {
entries, err := readDirN(dirname, 1)
if err != nil {
return false
}
return len(entries) == 0
}

9
cmd/xl-storage.go
View File

@ -195,15 +195,6 @@ func getValidPath(path string) (string, error) {
return path, nil
}
// isDirEmpty - returns whether given directory is empty or not.
func isDirEmpty(dirname string) bool {
entries, err := readDirN(dirname, 1)
if err != nil {
return false
}
return len(entries) == 0
}
// Initialize a new storage disk.
func newLocalXLStorage(path string) (*xlStorage, error) {
u := url.URL{Path: path}