Skip to content

PMM-14321: fix pmm-agent crashing when querying system variables #72

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
idoqo merged 3 commits into from
Dec 1, 2025
Merged

PMM-14321: fix pmm-agent crashing when querying system variables #72

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
7ce4ab6
fix pmm-agent crashing when querying system variables
idoqo Oct 30, 2025
f3c6c02
fix comments
idoqo Oct 30, 2025
c2df7b9
Merge branch 'main' into PMM-14321-slowlog-crashes
idoqo Nov 29, 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
2 changes: 1 addition & 1 deletion query/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ func Fingerprint(q string) string {
addSpace = false
// since we only consider the keywords if it exists at a top-level (except onDupeKeyUpdate),
// we only do the conversion below if the "keywords" actually open a value list (i.e., before opening a parenthesis).
if r == '(' || (isSpace(r) && (q[qi+1] == '(') || (q[qi+1] == ' ')) {
if r == '(' || (isSpace(r) && qi+1 < len(q) && ((q[qi+1] == '(') || (q[qi+1] == ' '))) {
// IN () -> in(?+)
// VALUES () -> values(?+)
s = inValues
Expand Down
22 changes: 22 additions & 0 deletions query/query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,3 +693,25 @@ func TestFingerprintSubqueries(t *testing.T) {
})
}
}

func TestFingerprintSystemVariableQueries(t *testing.T) {
type testCase struct {
name string
query string
expected string
}
// Test cases for system variable queries
testCases := []testCase{
{
name: "global read_only",
query: "set long_query_time = 0; SELECT @@GLOBAL.read_only AS Value",
expected: "set long_query_time = ?; select @@global.read_only as value",
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
actual := query.Fingerprint(tc.query)
assert.Equal(t, tc.expected, actual, "Query: %s", tc.query)
})
}
}