Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

utils/fs: add ReadAt to memory file and tests. #122

Merged
merged 1 commit into from
Nov 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion utils/fs/memory/memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,16 @@ func newFile(base, fullpath string, flag int) *file {
}

func (f *file) Read(b []byte) (int, error) {
n, err := f.ReadAt(b, f.position)
if err != nil {
return 0, err
}

f.position += int64(n)
return n, err
}

func (f *file) ReadAt(b []byte, off int64) (int, error) {
if f.IsClosed() {
return 0, fs.ErrClosed
}
Expand All @@ -197,7 +207,7 @@ func (f *file) Read(b []byte) (int, error) {
return 0, errors.New("read not supported")
}

n, err := f.content.ReadAt(b, f.position)
n, err := f.content.ReadAt(b, off)
f.position += int64(n)

return n, err
Expand Down
2 changes: 1 addition & 1 deletion utils/fs/os/os.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,6 @@ func (f *osFile) Close() error {
return f.file.Close()
}

func (f *osFile) ReadAt(p []byte, off int64) (n int, err error) {
func (f *osFile) ReadAt(p []byte, off int64) (int, error) {
return f.file.ReadAt(p, off)
}
34 changes: 34 additions & 0 deletions utils/fs/test/fs_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,3 +379,37 @@ func (s *FilesystemSuite) TestJoin(c *C) {
func (s *FilesystemSuite) TestBase(c *C) {
c.Assert(s.Fs.Base(), Not(Equals), "")
}

func (s *FilesystemSuite) TestReadAtOnReadWrite(c *C) {
f, err := s.Fs.Create("foo")
c.Assert(err, IsNil)
_, err = f.Write([]byte("abcdefg"))
c.Assert(err, IsNil)
rf, ok := f.(io.ReaderAt)
c.Assert(ok, Equals, true)
b := make([]byte, 3)
n, err := rf.ReadAt(b, 2)
c.Assert(err, IsNil)
c.Assert(n, Equals, 3)
c.Assert(string(b), Equals, "cde")
c.Assert(f.Close(), IsNil)
}

func (s *FilesystemSuite) TestReadAtOnReadOnly(c *C) {
f, err := s.Fs.Create("foo")
c.Assert(err, IsNil)
_, err = f.Write([]byte("abcdefg"))
c.Assert(err, IsNil)
c.Assert(f.Close(), IsNil)

f, err = s.Fs.Open("foo")
c.Assert(err, IsNil)
rf, ok := f.(io.ReaderAt)
c.Assert(ok, Equals, true)
b := make([]byte, 3)
n, err := rf.ReadAt(b, 2)
c.Assert(err, IsNil)
c.Assert(n, Equals, 3)
c.Assert(string(b), Equals, "cde")
c.Assert(f.Close(), IsNil)
}