MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 21:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove ODirectReader entirely since we do not need it anymore (#18619)

Browse Source
This commit is contained in:
Harshavardhana
2023-12-09 10:17:51 -08:00
committed by GitHub
parent 196e7e072b
commit 65f34cd823
4 changed files with 60 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/ioutil/read_file.go
View File

@@ -62,48 +62,18 @@ func ReadFileWithFileInfo(name string) ([]byte, fs.FileInfo, error) {
//
// passes NOATIME flag for reads on Unix systems to avoid atime updates.
func ReadFile(name string) ([]byte, error) {
if !disk.ODirectPlatform {
// Don't wrap with un-needed buffer.
// Don't use os.ReadFile, since it doesn't pass NO_ATIME when present.
f, err := OsOpenFile(name, readMode, 0o666)
if err != nil {
return nil, err
}
defer f.Close()
st, err := f.Stat()
if err != nil {
return io.ReadAll(f)
}
dst := make([]byte, st.Size())
_, err = io.ReadFull(f, dst)
return dst, err
}
f, err := OpenFileDirectIO(name, readMode, 0o666)
// Don't wrap with un-needed buffer.
// Don't use os.ReadFile, since it doesn't pass NO_ATIME when present.
f, err := OsOpenFile(name, readMode, 0o666)
if err != nil {
// fallback if there is an error to read
// 'name' with O_DIRECT
f, err = OsOpenFile(name, readMode, 0o666)
if err != nil {
return nil, err
}
return nil, err
}
r := &ODirectReader{
File: f,
SmallFile: true,
}
defer r.Close()
defer f.Close()
st, err := f.Stat()
if err != nil {
return io.ReadAll(r)
return io.ReadAll(f)
}
// Select bigger blocks when reading would do more than 2 reads.
r.SmallFile = st.Size() <= BlockSizeSmall*2
dst := make([]byte, st.Size())
_, err = io.ReadFull(r, dst)
_, err = io.ReadFull(f, dst)
return dst, err
}