remove MultiBuffer.Release

This commit is contained in:
Darien Raymond
2018-11-17 22:45:07 +01:00
parent b41513f644
commit 0f324a613e
15 changed files with 46 additions and 51 deletions
+2 -3
View File
@@ -37,7 +37,7 @@ func (r *cachedReader) Cache(b *buf.Buffer) {
mb, _ := r.reader.ReadMultiBufferTimeout(time.Millisecond * 100)
r.Lock()
if !mb.IsEmpty() {
common.Must(r.cache.WriteMultiBuffer(mb))
r.cache, _ = buf.MergeMulti(r.cache, mb)
}
b.Clear()
rawBytes := b.Extend(buf.Size)
@@ -75,8 +75,7 @@ func (r *cachedReader) ReadMultiBufferTimeout(timeout time.Duration) (buf.MultiB
func (r *cachedReader) CloseError() {
r.Lock()
if r.cache != nil {
r.cache.Release()
r.cache = nil
r.cache = buf.ReleaseMulti(r.cache)
}
r.Unlock()
r.reader.CloseError()
+1 -1
View File
@@ -36,7 +36,7 @@ func TestStatsWriter(t *testing.T) {
common.Must2(mb.Write([]byte("abcd")))
common.Must(writer.WriteMultiBuffer(mb))
mb.Release()
mb = buf.ReleaseMulti(mb)
common.Must2(mb.Write([]byte("efg")))
common.Must(writer.WriteMultiBuffer(mb))