change pool to store slice pointer

aws · Nov 1, 2024 · ff114b7 · ff114b7
1 parent 734b574
commit ff114b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/feature/s3/transfermanager/api_op_PutObject.go b/feature/s3/transfermanager/api_op_PutObject.go
@@ -753,12 +753,12 @@ func (u *uploader) nextReader(ctx context.Context) (io.Reader, int, func(), erro
 		return nil, 0, func() {}, err
 	}
 
-	n, err := readFillBuf(u.in.Body, part)
+	n, err := readFillBuf(u.in.Body, *part)
 
 	cleanup := func() {
 		u.partPool.Put(part)
 	}
-	return bytes.NewReader(part[0:n]), n, cleanup, err
+	return bytes.NewReader((*part)[0:n]), n, cleanup, err
 }
 
 func readFillBuf(r io.Reader, b []byte) (offset int, err error) {

diff --git a/feature/s3/transfermanager/pool.go b/feature/s3/transfermanager/pool.go
@@ -6,21 +6,22 @@ import (
 )
 
 type bytesBufferPool interface {
-	Get(context.Context) ([]byte, error)
-	Put([]byte)
+	Get(context.Context) (*[]byte, error)
+	Put(*[]byte)
 	Close()
 }
 
 type defaultSlicePool struct {
-	slices chan []byte
+	slices chan *[]byte
 }
 
 func newDefaultSlicePool(sliceSize int64, capacity int) *defaultSlicePool {
 	p := &defaultSlicePool{}
 
-	slices := make(chan []byte, capacity)
+	slices := make(chan *[]byte, capacity)
 	for i := 0; i < capacity; i++ {
-		slices <- make([]byte, sliceSize)
+		s := make([]byte, sliceSize)
+		slices <- &s
 	}
 
 	p.slices = slices
@@ -29,7 +30,7 @@ func newDefaultSlicePool(sliceSize int64, capacity int) *defaultSlicePool {
 
 var errZeroCapacity = fmt.Errorf("get called on zero capacity pool")
 
-func (p *defaultSlicePool) Get(ctx context.Context) ([]byte, error) {
+func (p *defaultSlicePool) Get(ctx context.Context) (*[]byte, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
@@ -50,7 +51,7 @@ func (p *defaultSlicePool) Get(ctx context.Context) ([]byte, error) {
 	}
 }
 
-func (p *defaultSlicePool) Put(bs []byte) {
+func (p *defaultSlicePool) Put(bs *[]byte) {
 	p.slices <- bs
 }
 

diff --git a/feature/s3/transfermanager/pool_test.go b/feature/s3/transfermanager/pool_test.go
@@ -9,15 +9,16 @@ import (
 func TestDefaultSlicePool(t *testing.T) {
 	pool := newDefaultSlicePool(1, 2)
 
-	var bs []byte
+	var bs *[]byte
 	var err error
 	var wg sync.WaitGroup
 
 	for i := 0; i < 200; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			pool.Put(bs)
+			bs := make([]byte, 1)
+			pool.Put(&bs)
 		}()
 	}
 	// wait for a slice to be put back