Fix constructor for BytePool

Signed-off-by: Christian Haudum <[email protected]>

pkg/loki/modules.go

@@ -763,11 +763,7 @@ func (t *Loki) initBloomStore() (services.Service, error) {
 	case "dynamic":
 		// sync buffer pool for bloom pages
 		// 128KB 256KB 512KB 1MB 2MB 4MB 8MB 16MB 32MB 64MB 128MB
-		pageAllocator = mempool.NewBytePoolAllocator(
-			128<<10, 128<<20, 2,
-			func(size int) interface{} {
-				return make([]byte, size)
-			})
+		pageAllocator = mempool.NewBytePoolAllocator(128<<10, 128<<20, 2)
 	case "fixed":
 		pageAllocator = mempool.New("bloom-page-pool", bsCfg.MemoryManagement.BloomPageMemPoolBuckets, reg)
 	default:

pkg/storage/bloom/v1/block.go

@@ -112,7 +112,7 @@ type BlockQuerier struct {
 }
 
 // NewBlockQuerier returns a new BlockQuerier for the given block.
-// WARNING: You can pass an implementation of Allocator that is responsibe for
+// WARNING: You can pass an implementation of Allocator that is responsible for
 // whether the underlying byte slice of the bloom page will be returned to the
 // pool for efficiency or not. Returning to the pool can only safely be used
 // when the underlying bloom bytes don't escape the decoder, i.e. when loading

pkg/storage/bloom/v1/util.go

@@ -44,11 +44,7 @@ var (
 
 	// buffer pool for series pages
 	// 1KB 2KB 4KB 8KB 16KB 32KB 64KB 128KB
-	SeriesPagePool = mempool.NewBytePoolAllocator(
-		1<<10, 128<<10, 2,
-		func(size int) interface{} {
-			return make([]byte, size)
-		})
+	SeriesPagePool = mempool.NewBytePoolAllocator(1<<10, 128<<10, 2)
 )
 
 func newCRC32() hash.Hash32 {

pkg/util/mempool/allocator.go

@@ -27,10 +27,10 @@ type BytePool struct {
 	pool *pool.Pool
 }
 
-func NewBytePoolAllocator(minSize, maxSize int, factor float64, makeFunc func(int) interface{}) *BytePool {
+func NewBytePoolAllocator(minSize, maxSize int, factor float64) *BytePool {
 	return &BytePool{
 		pool: pool.New(
-			128<<10, 128<<20, 2,
+			minSize, maxSize, factor,
 			func(size int) interface{} {
 				return make([]byte, size)
 			}),