Split's SplitStream now creates and returns a read only channel.

master
Frederick F. Kautz IV 10 years ago
parent d73c57cff9
commit c02fa65b0f
  1. 11
      pkgs/split/split.go
  2. 3
      pkgs/split/split_test.go
  3. 3
      pkgs/storage/encodedstorage/encoded_storage.go

@ -55,7 +55,13 @@ type JoinMessage struct {
// for chunk := range channel {
// log.Println(chunk.Data)
// }
func SplitStream(reader io.Reader, chunkSize uint64, ch chan SplitMessage) {
func SplitStream(reader io.Reader, chunkSize uint64) <-chan SplitMessage {
ch := make(chan SplitMessage)
go splitStreamGoRoutine(reader, chunkSize, ch)
return ch
}
func splitStreamGoRoutine(reader io.Reader, chunkSize uint64, ch chan SplitMessage) {
// we read until EOF or another error
var readError error
@ -199,8 +205,7 @@ func SplitFilesWithPrefix(filename string, chunkstr string, outputPrefix string)
}
// start stream splitting goroutine
ch := make(chan SplitMessage)
go SplitStream(file, chunkSize, ch)
ch := SplitStream(file, chunkSize)
// used to write each chunk out as a separate file. {{outputPrefix}}.{{i}}
i := 0

@ -38,9 +38,8 @@ func (s *MySuite) TestSplitStream(c *C) {
bytesWriter.Write([]byte(strconv.Itoa(i)))
}
bytesWriter.Flush()
ch := make(chan SplitMessage)
reader := bytes.NewReader(bytesBuffer.Bytes())
go SplitStream(reader, 25, ch)
ch := SplitStream(reader, 25)
var resultsBuffer bytes.Buffer
resultsWriter := bufio.NewWriter(&resultsBuffer)
for chunk := range ch {

@ -136,8 +136,7 @@ func (eStorage *encodedStorage) List(objectPath string) ([]storage.ObjectDescrip
func (eStorage *encodedStorage) Put(objectPath string, object io.Reader) error {
// split
chunks := make(chan split.SplitMessage)
go split.SplitStream(object, eStorage.BlockSize, chunks)
chunks := split.SplitStream(object, eStorage.BlockSize)
// for each chunk
encoderParameters, err := erasure.ParseEncoderParams(eStorage.K, eStorage.M, erasure.CAUCHY)

Loading…
Cancel
Save