From 3986815ae5e7e61c48f3ed979c32358710ef7e20 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 20 May 2014 17:12:10 -0400 Subject: [PATCH] mend --- sdk/go/src/arvados.org/streamer/streamer.go | 4 ++-- sdk/go/src/arvados.org/streamer/streamer_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/go/src/arvados.org/streamer/streamer.go b/sdk/go/src/arvados.org/streamer/streamer.go index b88613488b..0b8755fe40 100644 --- a/sdk/go/src/arvados.org/streamer/streamer.go +++ b/sdk/go/src/arvados.org/streamer/streamer.go @@ -39,7 +39,7 @@ type StreamReader struct { responses chan readResult } -func AsyncReaderStream(buffersize int, source io.Reader) *AsyncStream { +func AsyncStreamFromReader(buffersize int, source io.Reader) *AsyncStream { buf := make([]byte, buffersize) t := &AsyncStream{make(chan readRequest), make(chan error)} @@ -49,7 +49,7 @@ func AsyncReaderStream(buffersize int, source io.Reader) *AsyncStream { return t } -func AsyncSliceStream(buf []byte) *AsyncStream { +func AsyncStreamFromSlice(buf []byte) *AsyncStream { t := &AsyncStream{make(chan readRequest), nil} go transfer(buf, nil, t.requests, nil) diff --git a/sdk/go/src/arvados.org/streamer/streamer_test.go b/sdk/go/src/arvados.org/streamer/streamer_test.go index 3c2d83ae53..9e24cfb52b 100644 --- a/sdk/go/src/arvados.org/streamer/streamer_test.go +++ b/sdk/go/src/arvados.org/streamer/streamer_test.go @@ -144,7 +144,7 @@ func (s *StandaloneSuite) TestReadIntoShortBuffer(c *C) { func (s *StandaloneSuite) TestTransfer(c *C) { reader, writer := io.Pipe() - tr := StartTransferFromReader(512, reader) + tr := AsyncStreamFromReader(512, reader) br1 := tr.MakeStreamReader() out := make([]byte, 128) @@ -288,7 +288,7 @@ func (s *StandaloneSuite) TestTransferFromBuffer(c *C) { buffer[i] = byte(i) } - tr := StartTransferFromSlice(buffer) + tr := AsyncStreamFromSlice(buffer) br1 := tr.MakeStreamReader() @@ -328,7 +328,7 @@ func (s *StandaloneSuite) TestTransferIoCopy(c *C) { buffer[i] = byte(i) } - tr := StartTransferFromSlice(buffer) + tr := AsyncStreamFromSlice(buffer) br1 := tr.MakeStreamReader() -- 2.30.2