Skip to content
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
16 changes: 16 additions & 0 deletions nocopy/types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,28 @@
package nocopy

import (
"bytes"
"testing"

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

func TestStreamDecodeRetainsStrings(t *testing.T) {
type pair struct {
First String
Second String
}

want := pair{First: "first", Second: "second"}
data, err := binary.Marshal(want)
assert.NoError(t, err)

var got pair
assert.NoError(t, binary.NewDecoder(bytes.NewReader(data)).Decode(&got))
assert.Equal(t, want, got)
}

type composite map[string]column

type column struct {
Expand Down
8 changes: 1 addition & 7 deletions reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ func (r *sliceReader) Reset(b []byte) {
// streamReader represents a reader implementation for a generic reader (i.e. streams)
type streamReader struct {
Reader
scratch [10]byte
}

// Reader represents the interface a reader should implement.
Expand All @@ -179,12 +178,7 @@ func newStreamReader(r io.Reader) *streamReader {

// Slice selects a sub-slice of next bytes.
func (r *streamReader) Slice(n int) (buffer []byte, err error) {
if n <= 10 {
buffer = r.scratch[:n]
} else {
buffer = make([]byte, n, n)
}

buffer = make([]byte, n)
_, err = io.ReadFull(r, buffer)
return
}
Expand Down
Loading