mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-29 19:39:52 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

Correct seekableReader.Read() semantics

Browse Source 
I hadn't tested the case where the caller tries to Read() into
buffer that has more space than needed. ioutil.ReadAll() does this,
so it's important that this work right.
This commit is contained in:
Chris Masone
2016-02-04 15:14:15 -08:00
parent 3f6e68c74f
commit ac9d801e25
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/seekable_reader.go
+2 -2
View File
@@ -41,10 +41,10 @@ func (s *seekableReader) Read(b []byte) (n int, err error) {
return
}
d.Chk.Equal(s.cached, s.pos, "Position is somehow _after_ the cached data!")
if n, err = io.ReadFull(s.r, b); err != nil {
if n, err = s.r.Read(b); err != nil {
return
}
if _, werr := s.cache.Write(b); werr != nil {
if _, werr := s.cache.Write(b[:n]); werr != nil {
return 0, werr
}
s.pos += int64(n)
base/seekable_reader_test.go
+6
View File
@@ -48,6 +48,12 @@ func (suite *SeekableReaderTestSuite) TestRead() {
suite.readAndExpect(suite.content)
}
func (suite *SeekableReaderTestSuite) TestReadAll() {
b, err := ioutil.ReadAll(suite.contentRSC)
suite.NoError(err)
suite.Equal(string(suite.content), string(b))
}
func (suite *SeekableReaderTestSuite) TestSeekFromStart() {
offset := suite.contentLen - 2
ret, err := suite.contentRSC.Seek(offset, 0)