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

[release-20.0] Fix crash in the evalengine (#17487) #17489

Merged
merged 1 commit into from
Jan 8, 2025
Merged

[release-20.0] Fix crash in the evalengine (#17487) #17489

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
4 changes: 2 additions & 2 deletions go/vt/vtgate/evalengine/arena.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (a *Arena) newEvalEnum(raw []byte, values *EnumSetValues) *evalEnum {
} else {
a.aEnum = append(a.aEnum, evalEnum{})
}
val := &a.aEnum[len(a.aInt64)-1]
val := &a.aEnum[len(a.aEnum)-1]
s := string(raw)
val.string = s
val.value = valueIdx(values, s)
Expand All @@ -84,7 +84,7 @@ func (a *Arena) newEvalSet(raw []byte, values *EnumSetValues) *evalSet {
} else {
a.aSet = append(a.aSet, evalSet{})
}
val := &a.aSet[len(a.aInt64)-1]
val := &a.aSet[len(a.aSet)-1]
s := string(raw)
val.string = s
val.set = evalSetBits(values, s)
Expand Down
14 changes: 14 additions & 0 deletions go/vt/vtgate/evalengine/compiler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,20 @@ func TestCompilerSingle(t *testing.T) {
expression: `WEEK(timestamp '2024-01-01 10:34:58', 1)`,
result: `INT64(1)`,
},
{
expression: `column0 + 1`,
values: []sqltypes.Value{sqltypes.MakeTrusted(sqltypes.Enum, []byte("foo"))},
// Returns 0, as unknown enums evaluate here to -1. We have this test to
// exercise the path to push enums onto the stack.
result: `FLOAT64(0)`,
},
{
expression: `column0 + 1`,
values: []sqltypes.Value{sqltypes.MakeTrusted(sqltypes.Set, []byte("foo"))},
// Returns 1, as unknown sets evaluate here to 0. We have this test to
// exercise the path to push sets onto the stack.
result: `FLOAT64(1)`,
},
}

tz, _ := time.LoadLocation("Europe/Madrid")
Expand Down
Loading