mend

diff --git a/sdk/go/src/arvados.org/streamer/streamer.go b/sdk/go/src/arvados.org/streamer/streamer.go
index b88613488b4fe8e6a1515b48171f85997567306d..0b8755fe4042070e1b3cac6b74f9adba272a6979 100644 (file)
--- 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 3c2d83ae53faaa1bf972b2d4d2e9cc813721f5fa..9e24cfb52b26a4ba44aa5cdace4ce6a8f86a759a 100644 (file)
--- 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()