Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(dataobj): pool instances of dataobj encoders #16166

Merged
merged 1 commit into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions pkg/dataobj/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ type Builder struct {
logs *logs.Logs

state builderState

encoder *encoding.Encoder
}

type builderState int
Expand Down Expand Up @@ -160,8 +158,6 @@ func NewBuilder(cfg BuilderConfig) (*Builder, error) {
BufferSize: int(cfg.BufferSize),
SectionSize: int(cfg.TargetSectionSize),
}),

encoder: encoding.NewEncoder(nil),
}, nil
}

Expand Down Expand Up @@ -290,13 +286,15 @@ func (b *Builder) buildObject(output *bytes.Buffer) error {

initialBufferSize := output.Len()

b.encoder.Reset(output)
enc := encoderPool.Get().(*encoding.Encoder)
enc.Reset(output)
defer encoderPool.Put(enc)

if err := b.streams.EncodeTo(b.encoder); err != nil {
if err := b.streams.EncodeTo(enc); err != nil {
return fmt.Errorf("encoding streams: %w", err)
} else if err := b.logs.EncodeTo(b.encoder); err != nil {
} else if err := b.logs.EncodeTo(enc); err != nil {
return fmt.Errorf("encoding logs: %w", err)
} else if err := b.encoder.Flush(); err != nil {
} else if err := enc.Flush(); err != nil {
return fmt.Errorf("encoding object: %w", err)
}

Expand Down
15 changes: 15 additions & 0 deletions pkg/dataobj/pools.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package dataobj

import (
"sync"

"github.com/grafana/loki/v3/pkg/dataobj/internal/encoding"
)

// encoderPool holds a pool of [encoding.Encoder] instances. Callers must
// always reset pooled encoders before use.
var encoderPool = sync.Pool{
New: func() any {
return encoding.NewEncoder(nil)
},
}