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

fix(admin): Allow special characters in SYSTEM/OPTIMIZE queries #6680

Merged
merged 2 commits into from
Dec 16, 2024
Merged

fix(admin): Allow special characters in SYSTEM/OPTIMIZE queries #6680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d577c0d
fix(admin): Allow special characters in SYSTEM/OPTIMIZE queries
evanh Dec 16, 2024
497fd5e
fix test
evanh Dec 16, 2024
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 snuba/admin/clickhouse/system_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def _run_sql_query_on_host(
(SYSTEM)
\s
(?!SHUTDOWN\b)(?!KILL\b)
[\w\s]+
[\w\s'\-_]+
;? # Optional semicolon
$
""",
Expand All @@ -104,7 +104,7 @@ def _run_sql_query_on_host(
r"""^
(OPTIMIZE\sTABLE)
\s
[\w\s]+
[\w\s_\-']+
;? # Optional semicolon
$
""",
Expand Down
1 change: 1 addition & 0 deletions tests/admin/test_system_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ def test_invalid_system_query(sql_query: str) -> None:
("SYSSSSSSSTEM DO SOMETHING", False),
("SYSTEM STOP MERGES", True),
("SYSTEM STOP TTL MERGES", True),
("SYSTEM STOP TTL MERGES ON CLUSTER 'snuba-spans'", True),
("KILL MUTATION WHERE mutation_id='0000000000'", True),
("system STOP MerGes", True),
("system SHUTDOWN", False),
Expand Down
Loading