scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-10 04:47:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted directoryUsage back to using old Readdir()

Browse source
This commit is contained in:
Samir Patel 2021-05-26 11:31:48 -05:00 • committed by Samir Patel
parent ae6687e71b
commit e7f1c8b66a
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
txfactory.go
View file

@ -718,6 +718,8 @@ func (f *TxFactory) fieldUsage(indexPath string, fld *Field) (FieldUsage, error)
return fieldUsage, nil
}
// NOTE: Go 1.16 introduced a new Readdir() method that is supposed to be more performant.
// Not yet upgraded b/c new method is not compatible with older versions of Go.
func directoryUsage(fname string, recursive bool) (uint64, error) {
if !dirExists(fname) {
return 0, errors.Errorf("directory does not exist (%s)", fname)
@ -725,24 +727,26 @@ func directoryUsage(fname string, recursive bool) (uint64, error) {
var size uint64
entries, err := os.ReadDir(fname)
dir, err := os.Open(fname)
if err != nil {
return 0, errors.Wrap(err, "opening data subdirectory")
}
defer dir.Close()
files, err := dir.Readdir(-1)
if err != nil {
return 0, errors.Wrap(err, "reading data subdirectory")
}
for _, entry := range entries {
if recursive && entry.IsDir() {
sz, err := directoryUsage(path.Join(fname, entry.Name()), true)
for _, file := range files {
if recursive && file.IsDir() {
sz, err := directoryUsage(path.Join(fname, file.Name()), true)
if err != nil {
return 0, err
}
size += sz
} else {
fi, err := entry.Info()
if err != nil {
return 0, errors.Wrap(err, "getting file info")
}
size += uint64(fi.Size()) // NOTE this cast is safe for regular files, not necessarily others
size += uint64(file.Size()) // NOTE this cast is safe for regular files, not necessarily others
}
}