Skip to content

release-25.3: sql/stats: handle range counts when skipping dropped enum hist buckets #155650

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
merged 1 commit into from
Oct 20, 2025
Merged

release-25.3: sql/stats: handle range counts when skipping dropped enum hist buckets #155650

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 pkg/sql/opt/cat/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ type HistogramBucket struct {

// DistinctRange is the estimated number of distinct values between the upper
// bound of the previous bucket and UpperBound (both boundaries are
// exclusive).
// exclusive). The first bucket should always have DistinctRange=0.
DistinctRange float64

// UpperBound is the upper bound of the bucket.
Expand Down
28 changes: 17 additions & 11 deletions pkg/sql/opt/props/histogram.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sem/eval"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/util/buildutil"
"github.com/cockroachdb/cockroach/pkg/util/encoding"
"github.com/cockroachdb/cockroach/pkg/util/timetz"
"github.com/cockroachdb/errors"
Expand Down Expand Up @@ -79,6 +80,15 @@ func (h *Histogram) numEq(i int) float64 {
// selectivity applied. i must be greater than or equal to 0 and less than
// bucketCount.
func (h *Histogram) numRange(i int) float64 {
// The first bucket always has a zero value for NumRange, so the lower bound
// of the histogram is the upper bound of the first bucket. We only check this
// in test builds.
if i == 0 && h.buckets[i].NumRange != 0 {
if buildutil.CrdbTestBuild {
panic(errors.AssertionFailedf("the first bucket should have NumRange=0"))
}
return 0
}
return h.buckets[i].NumRange * h.selectivity
}

Expand All @@ -89,6 +99,13 @@ func (h *Histogram) distinctRange(i int) float64 {
n := h.buckets[i].NumRange
d := h.buckets[i].DistinctRange

if i == 0 && d != 0 {
if buildutil.CrdbTestBuild {
panic(errors.AssertionFailedf("the first bucket should have DistinctRange=0"))
}
return 0
}

if d == 0 {
return 0
}
Expand Down Expand Up @@ -207,11 +224,6 @@ func (h *Histogram) maxDistinctValuesCount() float64 {
return 0
}

// The first bucket always has a zero value for NumRange, so the lower bound
// of the histogram is the upper bound of the first bucket.
if h.numRange(0) != 0 {
panic(errors.AssertionFailedf("the first bucket should have NumRange=0"))
}
previousUpperBound := h.upperBound(0)

var count float64
Expand Down Expand Up @@ -326,12 +338,6 @@ func (h *Histogram) filter(
return filtered
}

// The first bucket always has a zero value for NumRange, so the lower bound
// of the histogram is the upper bound of the first bucket.
if h.numRange(0) != 0 {
panic(errors.AssertionFailedf("the first bucket should have NumRange=0"))
}

var iter histogramIter
iter.init(h, desc)
spanIndex := 0
Expand Down