simplify ray stream

common/buf/merge_reader.go

@@ -1,34 +0,0 @@
-package buf
-
-type MergingReader struct {
-	reader        Reader
-	timeoutReader TimeoutReader
-}
-
-func NewMergingReader(reader Reader) Reader {
-	return &MergingReader{
-		reader:        reader,
-		timeoutReader: reader.(TimeoutReader),
-	}
-}
-
-func (r *MergingReader) Read() (MultiBuffer, error) {
-	mb, err := r.reader.Read()
-	if err != nil {
-		return nil, err
-	}
-
-	if r.timeoutReader == nil {
-		return mb, nil
-	}
-
-	for {
-		mb2, err := r.timeoutReader.ReadTimeout(0)
-		if err != nil {
-			break
-		}
-		mb.AppendMulti(mb2)
-	}
-
-	return mb, nil
-}

common/buf/merge_reader_test.go

@@ -1,33 +0,0 @@
-package buf_test
-
-import (
-	"testing"
-
-	"context"
-
-	. "v2ray.com/core/common/buf"
-	"v2ray.com/core/testing/assert"
-	"v2ray.com/core/transport/ray"
-)
-
-func TestMergingReader(t *testing.T) {
-	assert := assert.On(t)
-
-	stream := ray.NewStream(context.Background())
-	b1 := New()
-	b1.AppendBytes('a', 'b', 'c')
-	stream.Write(NewMultiBufferValue(b1))
-
-	b2 := New()
-	b2.AppendBytes('e', 'f', 'g')
-	stream.Write(NewMultiBufferValue(b2))
-
-	b3 := New()
-	b3.AppendBytes('h', 'i', 'j')
-	stream.Write(NewMultiBufferValue(b3))
-
-	reader := NewMergingReader(stream)
-	b, err := reader.Read()
-	assert.Error(err).IsNil()
-	assert.Int(b.Len()).Equals(9)
-}

common/buf/multi_buffer.go

@@ -13,7 +13,7 @@ type MultiBufferReader interface {
 type MultiBuffer []*Buffer
 
 func NewMultiBuffer() MultiBuffer {
-	return MultiBuffer(make([]*Buffer, 0, 8))
+	return MultiBuffer(make([]*Buffer, 0, 32))
 }
 
 func NewMultiBufferValue(b ...*Buffer) MultiBuffer {