Skip to content

release-26.1: rowexec: add cancel checking to inverted joiner #160038

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

Merged
yuzefovich merged 1 commit into from
Dec 24, 2025
Merged

release-26.1: rowexec: add cancel checking to inverted joiner #160038

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
9 changes: 9 additions & 0 deletions pkg/sql/rowexec/inverted_joiner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/span"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/util/cancelchecker"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
"github.com/cockroachdb/cockroach/pkg/util/mon"
Expand Down Expand Up @@ -67,6 +68,8 @@ type invertedJoiner struct {
unlimitedMemMonitor *mon.BytesMonitor
diskMonitor *mon.BytesMonitor

cancelChecker cancelchecker.CancelChecker

// prefixEqualityCols are the ordinals of the columns from the join input
// that represent join values for the non-inverted prefix columns of
// multi-column inverted indexes. The length is equal to the number of
Expand Down Expand Up @@ -414,6 +417,11 @@ func (ij *invertedJoiner) Next() (rowenc.EncDatumRow, *execinfrapb.ProducerMetad
func (ij *invertedJoiner) readInput() (invertedJoinerState, *execinfrapb.ProducerMetadata) {
// Read the next batch of input rows.
for len(ij.inputRows) < ij.batchSize {
if err := ij.cancelChecker.Check(); err != nil {
ij.MoveToDraining(err)
return ijStateUnknown, nil
}

row, meta := ij.input.Next()
if meta != nil {
if meta.Err != nil {
Expand Down Expand Up @@ -742,6 +750,7 @@ func (ij *invertedJoiner) Start(ctx context.Context) {
&ij.scanStatsListener, &ij.tenantConsumptionListener,
)
ij.input.Start(ctx)
ij.cancelChecker.Reset(ctx, 16 /* checkInterval */)
ij.runningState = ijReadingInput
}

Expand Down
Loading