Skip to content

fix panic in stats histogram union and intersect #3116

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 3 commits into from
Jul 24, 2025
Merged

fix panic in stats histogram union and intersect #3116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e058a67
fix panic in stats histogram merging
Jul 24, 2025
c43ddc4
remove unnecessary break
Jul 24, 2025
3ecfd1e
[ga-format-pr] Run ./format_repo.sh to fix formatting
jycor Jul 24, 2025
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
42 changes: 22 additions & 20 deletions sql/stats/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,21 @@ func Union(ctx *sql.Context, b1, b2 []sql.HistogramBucket, types []sql.Type) ([]
if err != nil {
return nil, err
}
switch cmp {
case 0:
if k == len(key1)-1 {
ret = append(ret, b1[i])
i++
j++
}
continue
case +1:
if cmp == +1 {
ret = append(ret, b2[j])
j++
case -1:
break
}
if cmp == -1 {
ret = append(ret, b1[i])
i++
break
}
// if keys are equal, merge buckets
if k == len(key1)-1 {
ret = append(ret, b1[i])
i++
j++
}
}
}
Expand Down Expand Up @@ -78,18 +79,19 @@ func Intersect(ctx *sql.Context, b1, b2 []sql.HistogramBucket, types []sql.Type)
if err != nil {
return nil, err
}
switch cmp {
case 0:
if k == len(key1)-1 {
ret = append(ret, b1[i])
i++
j++
}
continue
case +1:
if cmp == +1 {
j++
case -1:
break
}
if cmp == -1 {
i++
break
}
// if keys are equal, merge buckets
if k == len(key1)-1 {
ret = append(ret, b1[i])
i++
j++
}
}
}
Expand Down
118 changes: 118 additions & 0 deletions sql/stats/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,3 +962,121 @@ func TestUpdateCounts(t *testing.T) {
})
}
}

func TestHistogramUnion(t *testing.T) {
ctx := sql.NewEmptyContext()
tests := []struct {
types []sql.Type
h1, h2 []sql.HistogramBucket
exp []sql.HistogramBucket
}{
{
types: []sql.Type{types.Int64},
h1: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{9}},
},
h2: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1}},
},
exp: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1}},
&Bucket{BoundVal: []interface{}{9}},
},
},
{
types: []sql.Type{types.Int64, types.Int64},
h1: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{1, 9}},
},
h2: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{9, 9}},
},
exp: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{1, 9}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
},
{
types: []sql.Type{types.Int64, types.Int64},
h1: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 9}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
h2: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
},
exp: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{1, 9}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
},
}
for _, tt := range tests {
t.Run(fmt.Sprintf("union: %v and %v", tt.h1, tt.h2), func(t *testing.T) {
res, err := Union(ctx, tt.h1, tt.h2, tt.types)
require.NoError(t, err)
require.Equal(t, tt.exp, res)
})
}
}

func TestHistogramIntersect(t *testing.T) {
ctx := sql.NewEmptyContext()
tests := []struct {
types []sql.Type
h1, h2 []sql.HistogramBucket
exp []sql.HistogramBucket
}{
{
types: []sql.Type{types.Int64},
h1: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1}},
},
h2: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1}},
},
exp: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1}},
},
},
{
types: []sql.Type{types.Int64, types.Int64},
h1: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{1, 9}},
},
h2: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
exp: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
},
},
{
types: []sql.Type{types.Int64, types.Int64},
h1: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
h2: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
exp: []sql.HistogramBucket{
&Bucket{BoundVal: []interface{}{1, 1}},
&Bucket{BoundVal: []interface{}{9, 9}},
},
},
}
for _, tt := range tests {
t.Run(fmt.Sprintf("union: %v and %v", tt.h1, tt.h2), func(t *testing.T) {
res, err := Intersect(ctx, tt.h1, tt.h2, tt.types)
require.NoError(t, err)
require.Equal(t, tt.exp, res)
})
}
}
Loading