Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(MmapFile): Don't error out if fileSize > sz #224

Merged
merged 1 commit into from
Nov 10, 2020
Merged

fix(MmapFile): Don't error out if fileSize > sz #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions z/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type MmapFile struct {

var NewFile = errors.New("Create a new file")

func OpenMmapFileUsing(fd *os.File, maxSz int, writable bool) (*MmapFile, error) {
func OpenMmapFileUsing(fd *os.File, sz int, writable bool) (*MmapFile, error) {
filename := fd.Name()
fi, err := fd.Stat()
if err != nil {
Expand All @@ -44,20 +44,13 @@ func OpenMmapFileUsing(fd *os.File, maxSz int, writable bool) (*MmapFile, error)

var rerr error
fileSize := fi.Size()
if maxSz > 0 {
// We have a legit maxSz provided.
if fileSize == 0 {
// If file is empty, truncate it to maxSz.
if err := fd.Truncate(int64(maxSz)); err != nil {
return nil, errors.Wrapf(err, "error while truncation")
}
fileSize = int64(maxSz)
rerr = NewFile

} else if fileSize > int64(maxSz) {
return nil, errors.Errorf("file size %d greater than max size %d",
fileSize, maxSz)
if sz > 0 && fileSize == 0 {
// If file is empty, truncate it to sz.
if err := fd.Truncate(int64(sz)); err != nil {
return nil, errors.Wrapf(err, "error while truncation")
}
fileSize = int64(sz)
rerr = NewFile
}

// fmt.Printf("Mmaping file: %s with writable: %v filesize: %d\n", fd.Name(), writable, fileSize)
Expand Down