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.

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

feat: retrieval padding piece #491

Merged
merged 1 commit into from
Nov 30, 2023
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
142 changes: 142 additions & 0 deletions retrievalprovider/httpretrieval/multi_reader.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
package httpretrieval

import (
"errors"
"io"

"github.com/filecoin-project/go-padreader"
)

var errSeeker = errors.New("seeker can't seek")
var errWhence = errors.New("seek: invalid whence")

type multiReader struct {
reader io.ReadSeeker
readerSize uint64
readerOffset int

nullReader io.Reader
nullReaderSize uint64
nullReaderOffset int
}

func newMultiReader(r io.ReadSeeker, size uint64) *multiReader {
padSize := padreader.PaddedSize(size)
nullReaderSize := uint64(padSize) - size
return &multiReader{
reader: r,
readerSize: size,

nullReader: io.LimitReader(nullReader{}, int64(nullReaderSize)),
nullReaderSize: nullReaderSize,
}
}

func (mr *multiReader) Read(p []byte) (int, error) {
if int(mr.readerSize)-mr.readerOffset >= len(p) {
n, err := mr.reader.Read(p)
mr.readerOffset += n
return n, err
}

var n int
var err error
remain := int(mr.readerSize) - mr.readerOffset
if remain > 0 {
n, err = mr.reader.Read(p[:remain])
mr.readerOffset += n
if err != nil {
return n, err
}
}

remain = int(mr.nullReaderSize) - mr.nullReaderOffset
if remain <= 0 {
return 0, io.EOF
}
if len(p)-n > remain {
n2, err := mr.nullReader.Read(p[n : remain+n])
mr.nullReaderOffset += n2
return n + n2, err
}

n2, err := mr.nullReader.Read(p[n:])
mr.nullReaderOffset += n2

return n + n2, err
}

func (mr *multiReader) Seek(offset int64, whence int) (int64, error) {
switch whence {
default:
return 0, errWhence
case io.SeekStart:
seekOffset2 := 0
seekOffset := offset
if offset > int64(mr.readerSize) {
seekOffset = int64(mr.readerSize)
seekOffset2 = int(offset - int64(mr.readerSize))
}
_, err := mr.reader.Seek(seekOffset, whence)
if err != nil {
return 0, errSeeker
}
mr.readerOffset = int(seekOffset)
mr.nullReaderOffset = seekOffset2
return offset, nil
case io.SeekCurrent:
if offset == 0 {
return 0, nil
}

if offset > 0 {
if mr.readerSize > uint64(mr.readerOffset) {
remain := int64(mr.readerSize) - int64(mr.readerOffset)
seekOffset := offset
if offset > remain {
seekOffset = remain
mr.nullReaderOffset = int(offset) - int(remain)
}
_, err := mr.reader.Seek(seekOffset, whence)
if err != nil {
return 0, errSeeker
}
return offset, nil
}
mr.nullReaderOffset = +int(offset)
return offset, nil
}
if offset+int64(mr.nullReaderOffset) < 0 {
mr.nullReaderOffset = 0
mr.readerOffset = int(offset) + mr.nullReaderOffset + int(mr.readerSize)
_, err := mr.reader.Seek(offset+int64(mr.nullReaderOffset), whence)
if err != nil {
return 0, errSeeker
}
return offset, nil
}
mr.nullReaderOffset += int(offset)

return offset, nil
case io.SeekEnd:
_, err := mr.reader.Seek(0, whence)
if err != nil {
return 0, err
}
mr.readerOffset = int(mr.readerSize)
mr.nullReaderOffset = int(mr.nullReaderSize)
return int64(mr.readerSize) + int64(mr.nullReaderSize) + offset, nil
}
}

var _ io.ReadSeeker = &multiReader{}

type nullReader struct{}

// Read writes NUL bytes into the provided byte slice.
func (nr nullReader) Read(b []byte) (int, error) {
for i := range b {
b[i] = 0
}
return len(b), nil
}
113 changes: 113 additions & 0 deletions retrievalprovider/httpretrieval/multi_reader_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
package httpretrieval

import (
"crypto/rand"
"io"
"os"
"path/filepath"
"testing"

"github.com/filecoin-project/go-padreader"

"github.com/stretchr/testify/assert"
)

func TestMultiReader(t *testing.T) {
dir := t.TempDir()
size := 10
paddedSize := int(padreader.PaddedSize(uint64(size)))
buf := make([]byte, size)
_, err := rand.Read(buf)
assert.NoError(t, err)
f, err := os.Create(filepath.Join(dir, "test"))
assert.NoError(t, err)
_, err = f.Write(buf)
assert.NoError(t, err)
defer f.Close() // nolint

_, err = f.Seek(0, io.SeekStart)
assert.NoError(t, err)
r := newMultiReader(f, uint64(size))
buf2 := make([]byte, 2*size)
n, err := r.Read(buf2)
assert.NoError(t, err)
assert.Equal(t, 2*size, n)
assert.Equal(t, buf, buf2[:size])
assert.Equal(t, make([]byte, size), buf2[size:])

_, err = f.Seek(0, io.SeekStart)
assert.NoError(t, err)
r = newMultiReader(f, uint64(size))
buf2 = make([]byte, size)
n, err = r.Read(buf2)
assert.NoError(t, err)
assert.Equal(t, size, n)
assert.Equal(t, buf, buf2)

_, err = f.Seek(0, io.SeekStart)
assert.NoError(t, err)
r = newMultiReader(f, uint64(size))
buf2 = make([]byte, size*100)
n, err = r.Read(buf2)
assert.NoError(t, err)
assert.Equal(t, paddedSize, n)
assert.Equal(t, buf, buf2[:size])
assert.Equal(t, make([]byte, paddedSize-size), buf2[size:paddedSize])
}

func TestMultiReaderSeek(t *testing.T) {
dir := t.TempDir()
size := 10
paddedSize := int(padreader.PaddedSize(uint64(size)))
buf := make([]byte, size)
_, err := rand.Read(buf)
assert.NoError(t, err)
f, err := os.Create(filepath.Join(dir, "test"))
assert.NoError(t, err)
_, err = f.Write(buf)
assert.NoError(t, err)
defer f.Close() // nolint

_, err = f.Seek(0, io.SeekStart)
assert.NoError(t, err)
r := newMultiReader(f, uint64(size))

var zero int64
ret, err := r.Seek(zero, io.SeekStart)
assert.NoError(t, err)
assert.Equal(t, zero, ret)

ret, err = r.Seek(zero, io.SeekEnd)
assert.NoError(t, err)
assert.Equal(t, int64(paddedSize), ret)

ret, err = r.Seek(zero, io.SeekCurrent)
assert.NoError(t, err)
assert.Equal(t, zero, ret)

for _, offset := range []int{1, 5, 10, 15, 50, paddedSize, 200} {
buf2 := make([]byte, size)
r = newMultiReader(f, uint64(size))

ret, err = r.Seek(int64(offset), io.SeekStart)
assert.NoError(t, err)
assert.Equal(t, int64(offset), ret)

n, err := r.Read(buf2)
if offset >= paddedSize {
assert.Equal(t, io.EOF, err)
assert.Equal(t, 0, n)
continue
}
assert.NoError(t, err)
assert.Equal(t, size, n)
if offset <= size {
assert.Equal(t, buf[offset:size], buf2[:size-offset])
assert.Equal(t, make([]byte, offset), buf2[n-offset:])
} else {
assert.Equal(t, make([]byte, size), buf2)
}
}

// todo: test r.Seek(zero, io.SeekCurrent)
}
Loading