Ensure function aliases allow retrying queries #54824
Merged
Conversation
This file contains hidden or 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
Previously, function aliases (ex. combining a `#group` and `#count`) would make queries non-retryable because `Function#as` would always wrap a given alias in a non-retryable `SqlLiteral`. This could be addressed by making `Function#as` behave similarly to `AliasPredication` (retry everything). However, `Function#as` can also just be removed so that `Function` uses `AliasPredication#as` instead. This behaves slightly differently because `AliasPredication#as` will now return the `Function` wrapped in an `Alias` (meaning the return value must be used). Only a single place in Active Record needed to be changed and all others already did the correct thing. This also resolves a long standing FIXME suggesting removing the custom `Function#as` in favor of using `Alias` nodes. The other half of the comment suggesting `Function` could inherit from `Unary` does not make sense because SQL functions could potentially take multiple parameters, so the existing superclass should not be changed.
byroot
force-pushed
the
hm-retryable-func-alias
branch
from
cd72234 to
d31ef5c
Compare
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.
Based on #54823 to avoid merge conflicts because they touch the same test
Motivation / Background
Previously, function aliases (ex. combining a
#groupand#count)would make queries non-retryable because
Function#aswould always wrapa given alias in a non-retryable
SqlLiteral.Detail
This could be addressed by making
Function#asbehave similarly toAliasPredication(retry everything). However,Function#ascan alsojust be removed so that
FunctionusesAliasPredication#asinstead.This behaves slightly differently because
AliasPredication#aswill nowreturn the
Functionwrapped in anAlias(meaning the return valuemust be used). Only a single place in Active Record needed to be changed
and all others already did the correct thing.
Additional information
This also resolves a long standing FIXME suggesting removing the custom
Function#asin favor of usingAliasnodes. The other half of thecomment suggesting
Functioncould inherit fromUnarydoes not makesense because SQL functions could potentially take multiple parameters,
so the existing superclass should not be changed.
Checklist
Before submitting the PR make sure the following are checked:
[Fix #issue-number]