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

release-23.2: sql: allow dropping routines with UDT-typed parameters #115904

Merged
merged 1 commit into from Dec 11, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Dec 9, 2023

Backport 1/1 commits from #115848 on behalf of @DrewKimball.

/cc @cockroachdb/release


Previously, it was not possible to specify UDT parameters when dropping a routine. This is because of an oversight in MatchAtIdentical, which was likely copied from MatchAt. Specifically, MatchAt has special handling for tuple types that take advantage of the fact that types.Equivalent allows types.AnyTuple to match with any other tuple. MatchAtIdentical, on the other hand, uses types.Identical, which does not make the same allowance. This meant that overload resolution would always fail for UDT parameters in code paths that use MatchAtIdentical`, such as DROP FUNCTION.

This patch removes the replacement logic for tuple types in MatchAtIdentical, so that types.Identical is always called with the original type. This allows statements like the following to succeed:

DROP PROCEDURE foo(x udt);

Fixes #114677

Release note (bug fix): Fixed a bug existing since v23.1 that prevented naming UDT parameters when dropping a user-defined function (or procedure).


Release justification: Fixes a bug that prevents DROP FUNCTION with a UDT parameter.

Previously, it was not possible to specify UDT parameters when dropping
a routine. This is because of an oversight in `MatchAtIdentical`, which
was likely copied from `MatchAt`. Specifically, `MatchAt` has special
handling for tuple types that take advantage of the fact that
`types.Equivalent` allows `types.AnyTuple` to match with any other tuple.
`MatchAtIdentical, on the other hand, uses `types.Identical`, which does
not make the same allowance. This meant that overload resolution would
always fail for UDT parameters in code paths that use `MatchAtIdentical`,
such as DROP FUNCTION.

This patch removes the replacement logic for tuple types in `MatchAtIdentical`,
so that `types.Identical` is always called with the original type. This allows
statements like the following to succeed:
```
DROP PROCEDURE foo(x udt);
```

Fixes #114677

Release note (bug fix): Fixed a bug existing since v23.1 that prevented
naming UDT parameters when dropping a user-defined function (or procedure).
@blathers-crl blathers-crl bot requested a review from a team as a code owner December 9, 2023 01:16
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-115848 branch from 3c8940a to b2915dd Compare December 9, 2023 01:16
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Dec 9, 2023
Copy link
Author

blathers-crl bot commented Dec 9, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Dec 9, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@rharding6373 rharding6373 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 (waiting on @DrewKimball and @mgartner)

@DrewKimball DrewKimball merged commit 5f340f0 into release-23.2 Dec 11, 2023
5 of 6 checks passed
@DrewKimball DrewKimball deleted the blathers/backport-release-23.2-115848 branch December 11, 2023 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants