Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
93868: colexec: fix range stats operator with the selection vector r=yuzefovich a=yuzefovich

Previously, if the input batch had a selection vector set, we could get an index out of bounds internal error because we would iterate up to the length of the selection vector which can exceed the length of the batch.

Note that in practice this should be very rare to hit - generally speaking, the selection vector has the same length as all of the vectors in the batch. I couldn't reproduce the problem when using `demo`, so there is no regression test. Introduction of unit tests that use powerful `RunTests` test harness (that might have caught this bug) is left as a TODO.

Fixes: cockroachdb#93806.

Release note (bug fix): CockroachDB could previously, in rare cases, encounter an internal error when evaluating `crdb_internal.range_stats` builtin (which powers `SHOW RANGES` command among other things). The bug was introduced in 22.2.0 and is now fixed.

Co-authored-by: Yahor Yuzefovich <[email protected]>
  • Loading branch information
craig[bot] and yuzefovich committed Dec 18, 2022
2 parents 51eb14b + 487a3ab commit 94e03c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions pkg/col/coldata/batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ type Batch interface {
// Selection, if not nil, returns the selection vector on this batch: a
// densely-packed list of the *increasing* indices in each column that have
// not been filtered out by a previous step.
// TODO(yuzefovich): consider ensuring that the length of the returned slice
// equals the length of the batch.
Selection() []int
// SetSelection sets whether this batch is using its selection vector or not.
SetSelection(bool)
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/colexec/range_stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (r *rangeStatsOperator) Next() coldata.Batch {
keysOutputIdx = append(keysOutputIdx, i)
}
} else {
for _, idx := range inSel {
for _, idx := range inSel[:batch.Length()] {
if inNulls.MaybeHasNulls() && inNulls.NullAt(idx) {
// Skip all NULL keys.
continue
Expand All @@ -127,6 +127,8 @@ func (r *rangeStatsOperator) Next() coldata.Batch {
// TODO(ajwerner): Reserve memory for the responses. We know they'll
// at least, on average, contain keys so it'll be 2x the size of the
// keys plus some constant multiple.
// TODO(yuzefovich): add unit tests that use the RunTests test
// harness.
res, err := r.fetcher.RangeStats(r.Ctx, keys...)
if err != nil {
colexecerror.ExpectedError(err)
Expand Down

0 comments on commit 94e03c0

Please sign in to comment.