Skip to content

Replace prealloc-passing with Release()-based pooling for term postings #2398

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.

Sign up for GitHub

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

Closed
capemox wants to merge 1 commit into from
Closed

Replace prealloc-passing with Release()-based pooling for term postings #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/blevesearch/go-porterstemmer v1.0.3
github.com/blevesearch/goleveldb v1.0.1
github.com/blevesearch/gtreap v0.1.1
github.com/blevesearch/scorch_segment_api/v2 v2.4.10
github.com/blevesearch/scorch_segment_api/v2 v2.4.11-0.20260915175815-2512945d4649
github.com/blevesearch/segment v0.9.1
github.com/blevesearch/snowball v0.6.1
github.com/blevesearch/snowballstem v0.9.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ github.com/blevesearch/mmap-go v1.2.0 h1:l33nNKPFcBjJUMwem6sAYJPUzhUCABoK9FxZDGi
github.com/blevesearch/mmap-go v1.2.0/go.mod h1:Vd6+20GBhEdwJnU1Xohgt88XCD/CTWcqbCNxkZpyBo0=
github.com/blevesearch/scorch_segment_api/v2 v2.4.10 h1:C3873+iWZ0YJM2ijaSHhJJzSvD4x1k+5UaQdGygZVhM=
github.com/blevesearch/scorch_segment_api/v2 v2.4.10/go.mod h1:WUUkAocbkDlNK/kgAE13NvS9oxe+u618mYZ8sOvcCc4=
github.com/blevesearch/scorch_segment_api/v2 v2.4.11-0.20260915175815-2512945d4649 h1:SZBy+klSH8iu9U4llxUreOgN9PM6Pddh+t9ClKsPTw0=
github.com/blevesearch/scorch_segment_api/v2 v2.4.11-0.20260915175815-2512945d4649/go.mod h1:WUUkAocbkDlNK/kgAE13NvS9oxe+u618mYZ8sOvcCc4=
github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
github.com/blevesearch/snowball v0.6.1 h1:cDYjn/NCH+wwt2UdehaLpr2e4BwLIjN4V/TdLsL+B5A=
Expand Down
18 changes: 16 additions & 2 deletions index/scorch/snapshot_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,18 @@ func (is *IndexSnapshot) InternalID(id string) (rv index.IndexInternalID, err er
return next.ID, nil
}

// releasePostings returns v to its implementation's internal pool if it
// opts into segment.Releasable. This is an optional capability, the same
// idiom as segment.OptimizablePostingsIterator: most segment.PostingsList/
// PostingsIterator values built by query optimization (e.g. the unadorned
// iterators in unadorned.go) don't back onto pooled memory and this is a
// no-op for them.
func releasePostings(v interface{}) {
if rel, ok := v.(segment.Releasable); ok {
rel.Release()
}
}

func (is *IndexSnapshot) TermFieldReader(ctx context.Context, term []byte, field string, includeFreq,
includeNorm, includeTermVectors bool,
) (index.TermFieldReader, error) {
Expand Down Expand Up @@ -684,8 +696,9 @@ func (is *IndexSnapshot) TermFieldReader(ctx context.Context, term []byte, field
var prevBytesReadPL uint64
if rv.postings[i] != nil {
prevBytesReadPL = rv.postings[i].BytesRead()
releasePostings(rv.postings[i])
}
pl, err := rv.dicts[i].PostingsList(term, s.deleted, rv.postings[i])
pl, err := rv.dicts[i].PostingsList(term, s.deleted, nil)
if err != nil {
return nil, err
}
Expand All @@ -694,8 +707,9 @@ func (is *IndexSnapshot) TermFieldReader(ctx context.Context, term []byte, field
var prevBytesReadItr uint64
if rv.iterators[i] != nil {
prevBytesReadItr = rv.iterators[i].BytesRead()
releasePostings(rv.iterators[i])
}
rv.iterators[i] = pl.Iterator(includeFreq, includeNorm, includeTermVectors, rv.iterators[i])
rv.iterators[i] = pl.Iterator(includeFreq, includeNorm, includeTermVectors, nil)

if bytesRead := rv.postings[i].BytesRead(); prevBytesReadPL < bytesRead {
rv.incrementBytesRead(bytesRead - prevBytesReadPL)
Expand Down
10 changes: 8 additions & 2 deletions index/scorch/snapshot_segment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,20 @@ func (cfd *cachedFieldDocs) prepareField(field string, ss *SegmentSnapshot) {
next, err := dictItr.Next()
for err == nil && next != nil {
var err1 error
postings, err1 = dict.PostingsList([]byte(next.Term), nil, postings)
if postings != nil {
releasePostings(postings)
}
postings, err1 = dict.PostingsList([]byte(next.Term), nil, nil)
if err1 != nil {
cfd.err = err1
return
}

cfd.size += uint64(size.SizeOfUint64) /* map key */
postingsItr = postings.Iterator(false, false, false, postingsItr)
if postingsItr != nil {
releasePostings(postingsItr)
}
postingsItr = postings.Iterator(false, false, false, nil)
nextPosting, err2 := postingsItr.Next()
for err2 == nil && nextPosting != nil {
docNum := nextPosting.Number()
Expand Down
Loading