@@ -24,7 +24,7 @@ type Bloom struct {
2424
2525func (b * Bloom ) Encode (enc * encoding.Encbuf ) error {
2626 // divide by 8 b/c bloom capacity is measured in bits, but we want bytes
27- buf := bytes .NewBuffer (make ([] byte , 0 , int (b .Capacity ()/ 8 )))
27+ buf := bytes .NewBuffer (BloomPagePool . Get ( int (b .Capacity () / 8 )))
2828
2929 // TODO(owen-d): have encoder implement writer directly so we don't need
3030 // to indirect via a buffer
@@ -36,6 +36,7 @@ func (b *Bloom) Encode(enc *encoding.Encbuf) error {
3636 data := buf .Bytes ()
3737 enc .PutUvarint (len (data )) // length of bloom filter
3838 enc .PutBytes (data )
39+ BloomPagePool .Put (data [:0 ]) // release to pool
3940 return nil
4041}
4142
@@ -63,14 +64,11 @@ func (b *Bloom) Decode(dec *encoding.Decbuf) error {
6364 return nil
6465}
6566
66- func LazyDecodeBloomPage (r io.Reader , alloc Allocator , pool chunkenc.ReaderPool , page BloomPageHeader ) (* BloomPageDecoder , error ) {
67- data , err := alloc .Get (page .Len )
68- if err != nil {
69- return nil , errors .Wrap (err , "allocating buffer" )
70- }
71- defer alloc .Put (data )
67+ func LazyDecodeBloomPage (r io.Reader , pool chunkenc.ReaderPool , page BloomPageHeader ) (* BloomPageDecoder , error ) {
68+ data := BloomPagePool .Get (page .Len )[:page .Len ]
69+ defer BloomPagePool .Put (data )
7270
73- _ , err = io .ReadFull (r , data )
71+ _ , err : =io .ReadFull (r , data )
7472 if err != nil {
7573 return nil , errors .Wrap (err , "reading bloom page" )
7674 }
@@ -86,10 +84,7 @@ func LazyDecodeBloomPage(r io.Reader, alloc Allocator, pool chunkenc.ReaderPool,
8684 }
8785 defer pool .PutReader (decompressor )
8886
89- b , err := alloc .Get (page .DecompressedLen )
90- if err != nil {
91- return nil , errors .Wrap (err , "allocating buffer" )
92- }
87+ b := BloomPagePool .Get (page .DecompressedLen )[:page .DecompressedLen ]
9388
9489 if _ , err = io .ReadFull (decompressor , b ); err != nil {
9590 return nil , errors .Wrap (err , "decompressing bloom page" )
@@ -101,18 +96,14 @@ func LazyDecodeBloomPage(r io.Reader, alloc Allocator, pool chunkenc.ReaderPool,
10196}
10297
10398// shortcut to skip allocations when we know the page is not compressed
104- func LazyDecodeBloomPageNoCompression (r io.Reader , alloc Allocator , page BloomPageHeader ) (* BloomPageDecoder , error ) {
99+ func LazyDecodeBloomPageNoCompression (r io.Reader , page BloomPageHeader ) (* BloomPageDecoder , error ) {
105100 // data + checksum
106101 if page .Len != page .DecompressedLen + 4 {
107102 return nil , errors .New ("the Len and DecompressedLen of the page do not match" )
108103 }
104+ data := BloomPagePool .Get (page .Len )[:page .Len ]
109105
110- data , err := alloc .Get (page .Len )
111- if err != nil {
112- return nil , errors .Wrap (err , "allocating buffer" )
113- }
114-
115- _ , err = io .ReadFull (r , data )
106+ _ , err := io .ReadFull (r , data )
116107 if err != nil {
117108 return nil , errors .Wrap (err , "reading bloom page" )
118109 }
@@ -167,16 +158,12 @@ type BloomPageDecoder struct {
167158// This can only safely be used when the underlying bloom
168159// bytes don't escape the decoder:
169160// on reads in the bloom-gw but not in the bloom-compactor
170- func (d * BloomPageDecoder ) Relinquish (alloc Allocator ) {
171- if d == nil {
172- return
173- }
174-
161+ func (d * BloomPageDecoder ) Relinquish () {
175162 data := d .data
176163 d .data = nil
177164
178165 if cap (data ) > 0 {
179- _ = alloc .Put (data )
166+ BloomPagePool .Put (data )
180167 }
181168}
182169
@@ -290,7 +277,7 @@ func (b *BloomBlock) DecodeHeaders(r io.ReadSeeker) (uint32, error) {
290277// BloomPageDecoder returns a decoder for the given page index.
291278// It may skip the page if it's too large.
292279// NB(owen-d): if `skip` is true, err _must_ be nil.
293- func (b * BloomBlock ) BloomPageDecoder (r io.ReadSeeker , alloc Allocator , pageIdx int , maxPageSize int , metrics * Metrics ) (res * BloomPageDecoder , skip bool , err error ) {
280+ func (b * BloomBlock ) BloomPageDecoder (r io.ReadSeeker , pageIdx int , maxPageSize int , metrics * Metrics ) (res * BloomPageDecoder , skip bool , err error ) {
294281 if pageIdx < 0 || pageIdx >= len (b .pageHeaders ) {
295282 metrics .pagesSkipped .WithLabelValues (pageTypeBloom , skipReasonOOB ).Inc ()
296283 metrics .bytesSkipped .WithLabelValues (pageTypeBloom , skipReasonOOB ).Add (float64 (b .pageHeaders [pageIdx ].DecompressedLen ))
@@ -313,9 +300,9 @@ func (b *BloomBlock) BloomPageDecoder(r io.ReadSeeker, alloc Allocator, pageIdx
313300 }
314301
315302 if b .schema .encoding == chunkenc .EncNone {
316- res , err = LazyDecodeBloomPageNoCompression (r , alloc , page )
303+ res , err = LazyDecodeBloomPageNoCompression (r , page )
317304 } else {
318- res , err = LazyDecodeBloomPage (r , alloc , b .schema .DecompressorPool (), page )
305+ res , err = LazyDecodeBloomPage (r , b .schema .DecompressorPool (), page )
319306 }
320307
321308 if err != nil {
0 commit comments