pool: add page backed reader/writer for multi thread uploads
This commit is contained in:
Nick Craig-Wood
parent
e8f3f98aa0
commit
0dea83a4aa
2 changed files with 513 additions and 0 deletions
204
lib/pool/reader_writer.go
Normal file
204
lib/pool/reader_writer.go
Normal file
|
|
@ -0,0 +1,204 @@
|
|||
package pool
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
)
|
||||
|
||||
// RW contains the state for the read/writer
|
||||
type RW struct {
|
||||
pool *Pool // pool to get pages from
|
||||
pages [][]byte // backing store
|
||||
size int // size written
|
||||
out int // offset we are reading from
|
||||
lastOffset int // size in last page
|
||||
}
|
||||
|
||||
var (
|
||||
errInvalidWhence = errors.New("pool.RW Seek: invalid whence")
|
||||
errNegativeSeek = errors.New("pool.RW Seek: negative position")
|
||||
errSeekPastEnd = errors.New("pool.RW Seek: attempt to seek past end of data")
|
||||
)
|
||||
|
||||
// NewRW returns a reader / writer which is backed from pages from the
|
||||
// pool passed in.
|
||||
//
|
||||
// Data can be stored in it by calling Write and read from it by
|
||||
// calling Read.
|
||||
//
|
||||
// When writing it only appends data. Seek only applies to reading.
|
||||
func NewRW(pool *Pool) *RW {
|
||||
return &RW{
|
||||
pool: pool,
|
||||
pages: make([][]byte, 0, 16),
|
||||
}
|
||||
}
|
||||
|
||||
// Returns the page and offset of i for reading.
|
||||
//
|
||||
// Ensure there are pages before calling this.
|
||||
func (rw *RW) readPage(i int) (page []byte) {
|
||||
pageNumber := i / rw.pool.bufferSize
|
||||
offset := i % rw.pool.bufferSize
|
||||
page = rw.pages[pageNumber]
|
||||
// Clip the last page to the amount written
|
||||
if pageNumber == len(rw.pages)-1 {
|
||||
page = page[:rw.lastOffset]
|
||||
}
|
||||
return page[offset:]
|
||||
}
|
||||
|
||||
// Read reads up to len(p) bytes into p. It returns the number of
|
||||
// bytes read (0 <= n <= len(p)) and any error encountered. If some
|
||||
// data is available but not len(p) bytes, Read returns what is
|
||||
// available instead of waiting for more.
|
||||
func (rw *RW) Read(p []byte) (n int, err error) {
|
||||
var (
|
||||
nn int
|
||||
page []byte
|
||||
)
|
||||
for len(p) > 0 {
|
||||
if rw.out >= rw.size {
|
||||
return n, io.EOF
|
||||
}
|
||||
page = rw.readPage(rw.out)
|
||||
nn = copy(p, page)
|
||||
p = p[nn:]
|
||||
n += nn
|
||||
rw.out += nn
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// WriteTo writes data to w until there's no more data to write or
|
||||
// when an error occurs. The return value n is the number of bytes
|
||||
// written. Any error encountered during the write is also returned.
|
||||
//
|
||||
// The Copy function uses WriteTo if available. This avoids an
|
||||
// allocation and a copy.
|
||||
func (rw *RW) WriteTo(w io.Writer) (n int64, err error) {
|
||||
var (
|
||||
nn int
|
||||
page []byte
|
||||
)
|
||||
for rw.out < rw.size {
|
||||
page = rw.readPage(rw.out)
|
||||
nn, err = w.Write(page)
|
||||
n += int64(nn)
|
||||
rw.out += nn
|
||||
if err != nil {
|
||||
return n, err
|
||||
}
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// Get the page we are writing to
|
||||
func (rw *RW) writePage() (page []byte) {
|
||||
if len(rw.pages) > 0 && rw.lastOffset < rw.pool.bufferSize {
|
||||
return rw.pages[len(rw.pages)-1][rw.lastOffset:]
|
||||
}
|
||||
page = rw.pool.Get()
|
||||
rw.pages = append(rw.pages, page)
|
||||
rw.lastOffset = 0
|
||||
return page
|
||||
}
|
||||
|
||||
// Write writes len(p) bytes from p to the underlying data stream. It returns
|
||||
// the number of bytes written len(p). It cannot return an error.
|
||||
func (rw *RW) Write(p []byte) (n int, err error) {
|
||||
var (
|
||||
nn int
|
||||
page []byte
|
||||
)
|
||||
for len(p) > 0 {
|
||||
page = rw.writePage()
|
||||
nn = copy(page, p)
|
||||
p = p[nn:]
|
||||
n += nn
|
||||
rw.size += nn
|
||||
rw.lastOffset += nn
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// ReadFrom reads data from r until EOF or error. The return value n is the
|
||||
// number of bytes read. Any error except EOF encountered during the read is
|
||||
// also returned.
|
||||
//
|
||||
// The Copy function uses ReadFrom if available. This avoids an
|
||||
// allocation and a copy.
|
||||
func (rw *RW) ReadFrom(r io.Reader) (n int64, err error) {
|
||||
var (
|
||||
nn int
|
||||
page []byte
|
||||
)
|
||||
for err == nil {
|
||||
page = rw.writePage()
|
||||
nn, err = r.Read(page)
|
||||
n += int64(nn)
|
||||
rw.size += nn
|
||||
rw.lastOffset += nn
|
||||
}
|
||||
if err == io.EOF {
|
||||
err = nil
|
||||
}
|
||||
return n, err
|
||||
}
|
||||
|
||||
// Seek sets the offset for the next Read (not Write - this is always
|
||||
// appended) to offset, interpreted according to whence: SeekStart
|
||||
// means relative to the start of the file, SeekCurrent means relative
|
||||
// to the current offset, and SeekEnd means relative to the end (for
|
||||
// example, offset = -2 specifies the penultimate byte of the file).
|
||||
// Seek returns the new offset relative to the start of the file or an
|
||||
// error, if any.
|
||||
//
|
||||
// Seeking to an offset before the start of the file is an error. Seeking
|
||||
// beyond the end of the written data is an error.
|
||||
func (rw *RW) Seek(offset int64, whence int) (int64, error) {
|
||||
var abs int64
|
||||
size := int64(rw.size)
|
||||
switch whence {
|
||||
case io.SeekStart:
|
||||
abs = offset
|
||||
case io.SeekCurrent:
|
||||
abs = int64(rw.out) + offset
|
||||
case io.SeekEnd:
|
||||
abs = size + offset
|
||||
default:
|
||||
return 0, errInvalidWhence
|
||||
}
|
||||
if abs < 0 {
|
||||
return 0, errNegativeSeek
|
||||
}
|
||||
if abs > size {
|
||||
return offset - (abs - size), errSeekPastEnd
|
||||
}
|
||||
rw.out = int(abs)
|
||||
return abs, nil
|
||||
}
|
||||
|
||||
// Close the buffer returning memory to the pool
|
||||
func (rw *RW) Close() error {
|
||||
for _, page := range rw.pages {
|
||||
rw.pool.Put(page)
|
||||
}
|
||||
rw.pages = nil
|
||||
return nil
|
||||
}
|
||||
|
||||
// Size returns the number of bytes in the buffer
|
||||
func (rw *RW) Size() int64 {
|
||||
return int64(rw.size)
|
||||
}
|
||||
|
||||
// Check interfaces
|
||||
var (
|
||||
_ io.Reader = (*RW)(nil)
|
||||
_ io.ReaderFrom = (*RW)(nil)
|
||||
_ io.Writer = (*RW)(nil)
|
||||
_ io.WriterTo = (*RW)(nil)
|
||||
_ io.Seeker = (*RW)(nil)
|
||||
_ io.Closer = (*RW)(nil)
|
||||
)
|
||||
309
lib/pool/reader_writer_test.go
Normal file
309
lib/pool/reader_writer_test.go
Normal file
|
|
@ -0,0 +1,309 @@
|
|||
package pool
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"io"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/rclone/rclone/lib/random"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
const blockSize = 4096
|
||||
|
||||
var rwPool = New(60*time.Second, blockSize, 2, false)
|
||||
|
||||
// A writer that always returns an error
|
||||
type testWriterError struct{}
|
||||
|
||||
var errWriteError = errors.New("write error")
|
||||
|
||||
func (testWriterError) Write(p []byte) (n int, err error) {
|
||||
return 0, errWriteError
|
||||
}
|
||||
|
||||
func TestRW(t *testing.T) {
|
||||
var dst []byte
|
||||
var pos int64
|
||||
var err error
|
||||
var n int
|
||||
|
||||
testData := []byte("Goodness!!") // 10 bytes long
|
||||
|
||||
newRW := func() *RW {
|
||||
rw := NewRW(rwPool)
|
||||
buf := bytes.NewBuffer(testData)
|
||||
nn, err := rw.ReadFrom(buf) // fill up with goodness
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(10), nn)
|
||||
assert.Equal(t, int64(10), rw.Size())
|
||||
return rw
|
||||
}
|
||||
|
||||
close := func(rw *RW) {
|
||||
assert.NoError(t, rw.Close())
|
||||
}
|
||||
|
||||
t.Run("Empty", func(t *testing.T) {
|
||||
// Test empty read
|
||||
rw := NewRW(rwPool)
|
||||
defer close(rw)
|
||||
assert.Equal(t, int64(0), rw.Size())
|
||||
|
||||
dst = make([]byte, 10)
|
||||
n, err = rw.Read(dst)
|
||||
assert.Equal(t, io.EOF, err)
|
||||
assert.Equal(t, 0, n)
|
||||
assert.Equal(t, int64(0), rw.Size())
|
||||
})
|
||||
|
||||
t.Run("Full", func(t *testing.T) {
|
||||
rw := newRW()
|
||||
defer close(rw)
|
||||
|
||||
// Test full read
|
||||
dst = make([]byte, 100)
|
||||
n, err = rw.Read(dst)
|
||||
assert.Equal(t, io.EOF, err)
|
||||
assert.Equal(t, 10, n)
|
||||
assert.Equal(t, testData, dst[0:10])
|
||||
|
||||
// Test read EOF
|
||||
n, err = rw.Read(dst)
|
||||
assert.Equal(t, io.EOF, err)
|
||||
assert.Equal(t, 0, n)
|
||||
|
||||
// Test Seek Back to start
|
||||
dst = make([]byte, 10)
|
||||
pos, err = rw.Seek(0, io.SeekStart)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 0, int(pos))
|
||||
|
||||
// Now full read
|
||||
n, err = rw.Read(dst)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 10, n)
|
||||
assert.Equal(t, testData, dst)
|
||||
})
|
||||
|
||||
t.Run("WriteTo", func(t *testing.T) {
|
||||
rw := newRW()
|
||||
defer close(rw)
|
||||
var b bytes.Buffer
|
||||
|
||||
n, err := rw.WriteTo(&b)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(10), n)
|
||||
assert.Equal(t, testData, b.Bytes())
|
||||
})
|
||||
|
||||
t.Run("WriteToError", func(t *testing.T) {
|
||||
rw := newRW()
|
||||
defer close(rw)
|
||||
w := testWriterError{}
|
||||
|
||||
n, err := rw.WriteTo(w)
|
||||
assert.Equal(t, errWriteError, err)
|
||||
assert.Equal(t, int64(0), n)
|
||||
})
|
||||
|
||||
t.Run("Partial", func(t *testing.T) {
|
||||
// Test partial read
|
||||
rw := newRW()
|
||||
defer close(rw)
|
||||
|
||||
dst = make([]byte, 5)
|
||||
n, err = rw.Read(dst)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 5, n)
|
||||
assert.Equal(t, testData[0:5], dst)
|
||||
n, err = rw.Read(dst)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 5, n)
|
||||
assert.Equal(t, testData[5:], dst)
|
||||
})
|
||||
|
||||
t.Run("Seek", func(t *testing.T) {
|
||||
// Test Seek
|
||||
rw := newRW()
|
||||
defer close(rw)
|
||||
|
||||
// Seek to end
|
||||
pos, err = rw.Seek(10, io.SeekStart)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(10), pos)
|
||||
|
||||
// Seek to start
|
||||
pos, err = rw.Seek(0, io.SeekStart)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(0), pos)
|
||||
|
||||
// Should not allow seek past cache index
|
||||
pos, err = rw.Seek(11, io.SeekCurrent)
|
||||
assert.Equal(t, errSeekPastEnd, err)
|
||||
assert.Equal(t, 10, int(pos))
|
||||
|
||||
// Should not allow seek to negative position start
|
||||
pos, err = rw.Seek(-1, io.SeekCurrent)
|
||||
assert.Equal(t, errNegativeSeek, err)
|
||||
assert.Equal(t, 0, int(pos))
|
||||
|
||||
// Should not allow seek with invalid whence
|
||||
pos, err = rw.Seek(0, 3)
|
||||
assert.Equal(t, errInvalidWhence, err)
|
||||
assert.Equal(t, 0, int(pos))
|
||||
|
||||
// Should seek from index with io.SeekCurrent(1) whence
|
||||
dst = make([]byte, 5)
|
||||
_, _ = rw.Read(dst)
|
||||
pos, err = rw.Seek(-3, io.SeekCurrent)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 2, int(pos))
|
||||
pos, err = rw.Seek(1, io.SeekCurrent)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 3, int(pos))
|
||||
|
||||
// Should seek from cache end with io.SeekEnd(2) whence
|
||||
pos, err = rw.Seek(-3, io.SeekEnd)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 7, int(pos))
|
||||
|
||||
// Should read from seek position and past it
|
||||
dst = make([]byte, 3)
|
||||
n, err = io.ReadFull(rw, dst)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 3, n)
|
||||
assert.Equal(t, testData[7:10], dst)
|
||||
})
|
||||
}
|
||||
|
||||
// A reader to read in chunkSize chunks
|
||||
type testReader struct {
|
||||
data []byte
|
||||
chunkSize int
|
||||
}
|
||||
|
||||
// Read in chunkSize chunks
|
||||
func (r *testReader) Read(p []byte) (n int, err error) {
|
||||
if len(r.data) == 0 {
|
||||
return 0, io.EOF
|
||||
}
|
||||
chunkSize := r.chunkSize
|
||||
if chunkSize > len(r.data) {
|
||||
chunkSize = len(r.data)
|
||||
}
|
||||
n = copy(p, r.data[:chunkSize])
|
||||
r.data = r.data[n:]
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// A writer to write in chunkSize chunks
|
||||
type testWriter struct {
|
||||
t *testing.T
|
||||
data []byte
|
||||
chunkSize int
|
||||
buf []byte
|
||||
offset int
|
||||
}
|
||||
|
||||
// Write in chunkSize chunks
|
||||
func (w *testWriter) Write(p []byte) (n int, err error) {
|
||||
if w.buf == nil {
|
||||
w.buf = make([]byte, w.chunkSize)
|
||||
}
|
||||
n = copy(w.buf, p)
|
||||
assert.Equal(w.t, w.data[w.offset:w.offset+n], w.buf[:n])
|
||||
w.offset += n
|
||||
return n, nil
|
||||
}
|
||||
|
||||
func TestRWBoundaryConditions(t *testing.T) {
|
||||
maxSize := 3 * blockSize
|
||||
buf := []byte(random.String(maxSize))
|
||||
|
||||
sizes := []int{
|
||||
1, 2, 3,
|
||||
blockSize - 2, blockSize - 1, blockSize, blockSize + 1, blockSize + 2,
|
||||
2*blockSize - 2, 2*blockSize - 1, 2 * blockSize, 2*blockSize + 1, 2*blockSize + 2,
|
||||
3*blockSize - 2, 3*blockSize - 1, 3 * blockSize,
|
||||
}
|
||||
|
||||
// Write the data in chunkSize chunks
|
||||
write := func(rw *RW, data []byte, chunkSize int) {
|
||||
writeData := data
|
||||
for len(writeData) > 0 {
|
||||
i := chunkSize
|
||||
if i > len(writeData) {
|
||||
i = len(writeData)
|
||||
}
|
||||
nn, err := rw.Write(writeData[:i])
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, len(writeData[:i]), nn)
|
||||
writeData = writeData[nn:]
|
||||
}
|
||||
}
|
||||
|
||||
// Write the data in chunkSize chunks using ReadFrom
|
||||
readFrom := func(rw *RW, data []byte, chunkSize int) {
|
||||
nn, err := rw.ReadFrom(&testReader{
|
||||
data: data,
|
||||
chunkSize: chunkSize,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(len(data)), nn)
|
||||
}
|
||||
|
||||
// Read the data back and check it is OK in chunkSize chunks
|
||||
read := func(rw *RW, data []byte, chunkSize int) {
|
||||
size := len(data)
|
||||
buf := make([]byte, chunkSize)
|
||||
offset := 0
|
||||
for {
|
||||
nn, err := rw.Read(buf)
|
||||
expectedRead := len(buf)
|
||||
if offset+chunkSize > size {
|
||||
expectedRead = size - offset
|
||||
assert.Equal(t, err, io.EOF)
|
||||
} else {
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
assert.Equal(t, expectedRead, nn)
|
||||
assert.Equal(t, data[offset:offset+nn], buf[:nn])
|
||||
offset += nn
|
||||
if err == io.EOF {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Read the data back and check it is OK in chunkSize chunks using WriteTo
|
||||
writeTo := func(rw *RW, data []byte, chunkSize int) {
|
||||
nn, err := rw.WriteTo(&testWriter{
|
||||
t: t,
|
||||
data: data,
|
||||
chunkSize: chunkSize,
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, int64(len(data)), nn)
|
||||
}
|
||||
|
||||
// Read and Write the data with a range of block sizes and functions
|
||||
for _, writeFn := range []func(*RW, []byte, int){write, readFrom} {
|
||||
for _, readFn := range []func(*RW, []byte, int){read, writeTo} {
|
||||
for _, size := range sizes {
|
||||
data := buf[:size]
|
||||
for _, chunkSize := range sizes {
|
||||
//t.Logf("Testing size=%d chunkSize=%d", useWrite, size, chunkSize)
|
||||
rw := NewRW(rwPool)
|
||||
assert.Equal(t, int64(0), rw.Size())
|
||||
writeFn(rw, data, chunkSize)
|
||||
assert.Equal(t, int64(size), rw.Size())
|
||||
readFn(rw, data, chunkSize)
|
||||
assert.NoError(t, rw.Close())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue