gopkg/pgx
2
0
Fork 0
Code Activity

Rename Option to Config

Browse Source
This commit is contained in:
Jack Christensen
2019-06-08 18:06:29 -05:00
parent 517cfde605
commit ecdcf4a367
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chunkreader.go
+13 -12
View File
@@ -12,31 +12,32 @@ type ChunkReader struct {
buf []byte buf []byte
rp, wp int // buf read position and write position rp, wp int // buf read position and write position
options Options config Config
} }
type Options struct { // Config contains configuration parameters for ChunkReader.
type Config struct {
MinBufLen int // Minimum buffer length MinBufLen int // Minimum buffer length
} }
func NewChunkReader(r io.Reader) *ChunkReader { func NewChunkReader(r io.Reader) *ChunkReader {
cr, err := NewChunkReaderEx(r, Options{}) cr, err := NewChunkReaderEx(r, Config{})
if err != nil { if err != nil {
panic("default options can't be bad") panic("default config can't be bad")
} }
return cr return cr
} }
func NewChunkReaderEx(r io.Reader, options Options) (*ChunkReader, error) { func NewChunkReaderEx(r io.Reader, config Config) (*ChunkReader, error) {
if options.MinBufLen == 0 { if config.MinBufLen == 0 {
options.MinBufLen = 4096 config.MinBufLen = 4096
} }
return &ChunkReader{ return &ChunkReader{
r: r, r: r,
buf: make([]byte, options.MinBufLen), buf: make([]byte, config.MinBufLen),
options: options, config: config,
}, nil }, nil
} }
@@ -78,8 +79,8 @@ func (r *ChunkReader) appendAtLeast(fillLen int) error {
} }
func (r *ChunkReader) newBuf(size int) []byte { func (r *ChunkReader) newBuf(size int) []byte {
if size < r.options.MinBufLen { if size < r.config.MinBufLen {
size = r.options.MinBufLen size = r.config.MinBufLen
} }
return make([]byte, size) return make([]byte, size)
} }
chunkreader_test.go
+3 -3
View File
@@ -7,7 +7,7 @@ import (
func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) { func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) {
server := &bytes.Buffer{} server := &bytes.Buffer{}
r, err := NewChunkReaderEx(server, Options{MinBufLen: 4}) r, err := NewChunkReaderEx(server, Config{MinBufLen: 4})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -44,7 +44,7 @@ func TestChunkReaderNextDoesNotReadIfAlreadyBuffered(t *testing.T) {
func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) { func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) {
server := &bytes.Buffer{} server := &bytes.Buffer{}
r, err := NewChunkReaderEx(server, Options{MinBufLen: 4}) r, err := NewChunkReaderEx(server, Config{MinBufLen: 4})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -66,7 +66,7 @@ func TestChunkReaderNextExpandsBufAsNeeded(t *testing.T) {
func TestChunkReaderDoesNotReuseBuf(t *testing.T) { func TestChunkReaderDoesNotReuseBuf(t *testing.T) {
server := &bytes.Buffer{} server := &bytes.Buffer{}
r, err := NewChunkReaderEx(server, Options{MinBufLen: 4}) r, err := NewChunkReaderEx(server, Config{MinBufLen: 4})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }