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: fix statement tags for CREATE and DROP PROCEDURE #112327

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Oct 13, 2023

Backport 1/1 commits from #112054 on behalf of @mgartner.

/cc @cockroachdb/release


Epic: CRDB-25388

Release note: None


Release justification: Minor bug fix for new features.

@blathers-crl blathers-crl bot requested review from a team as code owners October 13, 2023 17:26
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-112054 branch from 46eb5fb to 63b7faa Compare October 13, 2023 17:26
@blathers-crl blathers-crl bot added the blathers-backport This is a backport that Blathers created automatically. label Oct 13, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-112054 branch from 2ae46e4 to 1c8115b Compare October 13, 2023 17:26
@blathers-crl blathers-crl bot added the O-robot Originated from a bot. label Oct 13, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Oct 13, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • 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.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Oct 13, 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, @ecwall, @fqazi, and @mgartner)

@mgartner mgartner requested a review from michae2 October 13, 2023 22:35
Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 12 of 12 files at r1, all commit messages.
Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @blathers-crl[bot], @DrewKimball, @ecwall, @fqazi, and @mgartner)


pkg/sql/schemachanger/scbuild/internal/scbuildstmt/process_test.go line 24 at r1 (raw file):

func TestSupportedStatements(t *testing.T) {
	// Some statements n supportedStatements have multiple statementTags. This

typo here, but we can ignore it if it's too onerous to fix it in the backport

@michae2
Copy link
Collaborator

michae2 commented Oct 13, 2023

I'm not sure if it is directly related, but the timeout in TestCompareLegacyAndDeclarative is a little concerning. Maybe it's a known flake?

@DrewKimball
Copy link
Collaborator

Yeah, it's flaking: #112301

@mgartner mgartner force-pushed the blathers/backport-release-23.2-112054 branch from 1c8115b to 990295d Compare October 16, 2023 15:58
@mgartner
Copy link
Collaborator

TFTR!

@mgartner mgartner merged commit a8e494e into release-23.2 Oct 17, 2023
2 checks passed
@mgartner mgartner deleted the blathers/backport-release-23.2-112054 branch October 17, 2023 17:57
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.

5 participants