fix(spans): Scrub RELEASE SAVEPOINT statements #3091
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dav1dde
reviewed
Feb 12, 2024
| @@ -492,7 +497,6 @@ impl VisitorMut for NormalizeVisitor { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| _ => {} | |||
There was a problem hiding this comment.
Can we get rid of this catch all, if in the future the library introduces new values to the enum it won't compile and we know we have to check something?
There was a problem hiding this comment.
We absolutely should. I already started doing it and then gave up because there are so many match arms. But I guess I'll just power through.
jjbayer
commented
Feb 12, 2024
relay-event-normalization/src/normalize/span/description/sql/parser.rs
Outdated
Show resolved
Hide resolved
Comment on lines
+508
to
+671
| Statement::CreateExtension { name, .. } => Self::scrub_name(name), | ||
| Statement::Flush { channel, .. } => *channel = None, | ||
| Statement::Discard { .. } => {} | ||
| Statement::SetRole { role_name, .. } => { | ||
| if let Some(role_name) = role_name { | ||
| Self::scrub_name(role_name); | ||
| } | ||
| } | ||
| Statement::SetVariable { .. } => {} | ||
| Statement::SetTimeZone { .. } => {} | ||
| Statement::SetNames { | ||
| charset_name, | ||
| collation_name, | ||
| } => { | ||
| *charset_name = "%s".into(); | ||
| *collation_name = None; | ||
| } | ||
| Statement::SetNamesDefault {} => {} | ||
| Statement::ShowFunctions { filter } => Self::scrub_statement_filter(filter), | ||
| Statement::ShowVariable { variable } => Self::simplify_compound_identifier(variable), | ||
| Statement::ShowVariables { filter, .. } => Self::scrub_statement_filter(filter), | ||
| Statement::ShowCreate { .. } => {} | ||
| Statement::ShowColumns { filter, .. } => Self::scrub_statement_filter(filter), | ||
| Statement::ShowTables { | ||
| db_name, filter, .. | ||
| } => { | ||
| if let Some(db_name) = db_name { | ||
| Self::scrub_name(db_name); | ||
| } | ||
| Self::scrub_statement_filter(filter); | ||
| } | ||
| Statement::ShowCollation { filter } => Self::scrub_statement_filter(filter), | ||
| Statement::Use { db_name } => Self::scrub_name(db_name), | ||
| Statement::StartTransaction { .. } => {} | ||
| Statement::SetTransaction { .. } => {} | ||
| Statement::Comment { comment, .. } => *comment = None, | ||
| Statement::Commit { .. } => {} | ||
| Statement::Rollback { savepoint, .. } => { | ||
| if let Some(savepoint) = savepoint { | ||
| Self::erase_name(savepoint); | ||
| } | ||
| } | ||
| Statement::CreateSchema { .. } => {} | ||
| Statement::CreateDatabase { | ||
| location, | ||
| managed_location, | ||
| .. | ||
| } => { | ||
| *location = None; | ||
| *managed_location = None; | ||
| } | ||
| Statement::CreateFunction { .. } => {} | ||
| Statement::CreateProcedure { .. } => {} | ||
| Statement::CreateMacro { .. } => {} | ||
| Statement::CreateStage { comment, .. } => *comment = None, | ||
| Statement::Assert { .. } => {} | ||
| Statement::Grant { | ||
| grantees, | ||
| granted_by, | ||
| .. | ||
| } => { | ||
| Self::simplify_compound_identifier(grantees); | ||
| *granted_by = None; | ||
| } | ||
| Statement::Revoke { | ||
| grantees, | ||
| granted_by, | ||
| .. | ||
| } => { | ||
| Self::simplify_compound_identifier(grantees); | ||
| *granted_by = None; | ||
| } | ||
| Statement::Deallocate { name, .. } => { | ||
| Self::scrub_name(name); | ||
| } | ||
| Statement::Execute { name, .. } => Self::scrub_name(name), | ||
| Statement::Prepare { name, .. } => Self::scrub_name(name), | ||
| Statement::Kill { id, .. } => *id = 0, | ||
| Statement::ExplainTable { .. } => {} | ||
| Statement::Explain { .. } => {} | ||
| Statement::Merge { .. } => {} | ||
| Statement::Cache { .. } => {} | ||
| Statement::UNCache { .. } => {} | ||
| Statement::CreateSequence { .. } => {} | ||
| Statement::CreateType { .. } => {} | ||
| Statement::Pragma { .. } => {} | ||
| Statement::LockTables { tables } => { | ||
| for table in tables { | ||
| let LockTable { | ||
| table, | ||
| alias, | ||
| lock_type: _, | ||
| } = table; | ||
| Self::scrub_name(table); | ||
| if let Some(alias) = alias { | ||
| Self::scrub_name(alias); | ||
| } | ||
| } | ||
| } | ||
| Statement::UnlockTables => {} |
There was a problem hiding this comment.
These have not caused high cardinality in the past, but it's better to list them explicitly in case a new variant is introduced.
olksdr
approved these changes
Feb 12, 2024
Dav1dde
approved these changes
Feb 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sqlparser improved parsing capabilities, which made us rely on the fallback scrubber less. Unfortunately, In the case of savepoints, the fallback scrubber caught more than the parser-based scrubber.
Reverts #3083
Fixes #3085