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.

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

builtins: fix crdb_internal.hide_sql_constants array overload #97853

Merged
merged 1 commit into from
Mar 1, 2023

Conversation

xinhaoz
Copy link
Member

@xinhaoz xinhaoz commented Mar 1, 2023

Previously, erroring on parsing a stmt provided in one of the array elements to crdb_internal.hide_sql_constants would result in an error. This commit ensures that the empty string is returned for an unparseable stmt.

Epic: none

Release note: None

@xinhaoz xinhaoz requested review from a team March 1, 2023 16:36
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link

@THardy98 THardy98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intended to work this way, where we swallow the error on statements that can't be parsed with an empty?

Just wondering what the intuition here is.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@xinhaoz
Copy link
Member Author

xinhaoz commented Mar 1, 2023

Yes, I just noticed I messed up the return here for this overload, should only be relevant for testing right now.

@xinhaoz xinhaoz requested a review from THardy98 March 1, 2023 16:50
Previously, erroring on parsing a stmt provided in
one of the array elements to crdb_internal.hide_sql_constants
would result in an error. This commit ensures that
the empty string is returned for an unparseable stmt.

Epic: none

Release note: None
@xinhaoz xinhaoz force-pushed the builtins-array-fix branch from 7b7f3e6 to 17f635d Compare March 1, 2023 16:50
Copy link

@THardy98 THardy98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@xinhaoz
Copy link
Member Author

xinhaoz commented Mar 1, 2023

bors r+

@craig
Copy link
Contributor

craig bot commented Mar 1, 2023

Build succeeded:

@craig craig bot merged commit c3348b0 into cockroachdb:master Mar 1, 2023
@xinhaoz xinhaoz deleted the builtins-array-fix branch June 5, 2023 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants