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.

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

sql/rowexec: recycle coveringSpans in batchedInvertedExprEvaluator #53237

Merged
merged 1 commit into from
Aug 22, 2020
Merged

sql/rowexec: recycle coveringSpans in batchedInvertedExprEvaluator #53237

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
14 changes: 8 additions & 6 deletions pkg/sql/rowexec/inverted_expr_evaluator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ type batchedInvertedExprEvaluator struct {
fragmentedSpans []invertedSpanRoutingInfo

// Temporary state used during initialization.
routingSpans []invertedSpanRoutingInfo
routingSpans []invertedSpanRoutingInfo
coveringSpans []invertedSpan
}

// Helper used in building fragmentedSpans using pendingSpans. pendingSpans
Expand Down Expand Up @@ -348,7 +349,8 @@ func (b *batchedInvertedExprEvaluator) pendingLenWithSameEnd(
}

// init fragments the spans for later routing of rows and returns spans
// representing a union of all the spans (for executing the scan).
// representing a union of all the spans (for executing the scan). The
// returned slice is only valid until the next call to reset.
func (b *batchedInvertedExprEvaluator) init() []invertedSpan {
if cap(b.exprEvals) < len(b.exprs) {
b.exprEvals = make([]*invertedExprEvaluator, len(b.exprs))
Expand Down Expand Up @@ -389,7 +391,6 @@ func (b *batchedInvertedExprEvaluator) init() []invertedSpan {
})

// The union of the spans, which is returned from this function.
var coveringSpans []invertedSpan
currentCoveringSpan := b.routingSpans[0].span
// Create a slice of pendingSpans to be fragmented by windowing over the
// full collection of routingSpans. All spans in a given window have the
Expand All @@ -404,7 +405,7 @@ func (b *batchedInvertedExprEvaluator) init() []invertedSpan {
if bytes.Compare(pendingSpans[0].span.Start, span.span.Start) < 0 {
pendingSpans = b.fragmentPendingSpans(pendingSpans, span.span.Start)
if bytes.Compare(currentCoveringSpan.End, span.span.Start) < 0 {
coveringSpans = append(coveringSpans, currentCoveringSpan)
b.coveringSpans = append(b.coveringSpans, currentCoveringSpan)
currentCoveringSpan = span.span
} else if bytes.Compare(currentCoveringSpan.End, span.span.End) < 0 {
currentCoveringSpan.End = span.span.End
Expand All @@ -417,8 +418,8 @@ func (b *batchedInvertedExprEvaluator) init() []invertedSpan {
pendingSpans = pendingSpans[:len(pendingSpans)+1]
}
b.fragmentPendingSpans(pendingSpans, nil)
coveringSpans = append(coveringSpans, currentCoveringSpan)
return coveringSpans
b.coveringSpans = append(b.coveringSpans, currentCoveringSpan)
return b.coveringSpans
}

// TODO(sumeer): if this will be called in non-decreasing order of enc,
Expand Down Expand Up @@ -451,4 +452,5 @@ func (b *batchedInvertedExprEvaluator) reset() {
b.exprEvals = b.exprEvals[:0]
b.fragmentedSpans = b.fragmentedSpans[:0]
b.routingSpans = b.routingSpans[:0]
b.coveringSpans = b.coveringSpans[:0]
}