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.1: opt: fixup CTE stats on placeholder queries #99823

Merged
merged 1 commit into from
May 3, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 28, 2023

Backport 1/1 commits from #99433 on behalf of @cucaroach.

/cc @cockroachdb/release


During optbuilder phase we copy the initial expressions stats into the
fake-rel but this value can change when placeholders are assigned so add
code in AssignPlaceholders to rebuild the cte if the stats change.

Fixes: #99389
Epic: none
Release note: none


Release justification: Fixes issue with chosing optimal plan when using placeholders with CTE queries where only workaround was to not use placeholders.

During optbuilder phase we copy the initial expressions stats into the
fake-rel but this value can change when placeholders are assigned so add
code in AssignPlaceholders to rebuild the cte if the stats change.

Fixes: #99389
Epic: none
Release note (sql change): Prepared statements using placeholders in
recursive CTEs sometimes did not re-optimize correctly after plugging
in the parameters leading to poor plan choices, this has been fixed.
@blathers-crl blathers-crl bot requested a review from a team as a code owner March 28, 2023 16:36
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-99433 branch from 8cc92b2 to 8388be7 Compare March 28, 2023 16:36
@blathers-crl
Copy link
Author

blathers-crl bot commented Mar 28, 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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 28, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@mgartner
Copy link
Collaborator

Let's hold off on merging this until v23.1.1. I've added the do-not-merge label for now.

@mgartner mgartner added the do-not-merge bors won't merge a PR with this label. label Mar 28, 2023
@cucaroach
Copy link
Contributor

Should I wait to do 22.2 and 22.1 as well or is it fine for fixes to get backported to older releases before newer releases? Seems weird but probably benign.

@mgartner
Copy link
Collaborator

mgartner commented Apr 3, 2023

We can backport to 22.2 and 22.1 now. For 23.1 we're only merging blockers at the moment.

@github-actions
Copy link

Reminder: it has been 3 weeks please merge or close your backport!

@cucaroach cucaroach removed the do-not-merge bors won't merge a PR with this label. label Apr 26, 2023
@cucaroach
Copy link
Contributor

Removed DNM label, ready to go into 23.1 now.

Copy link
Collaborator

@mgartner mgartner left a comment

Choose a reason for hiding this comment

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

:lgtm: Don't forget to add a release-justification.

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @cucaroach, @DrewKimball, @msirek, and @rharding6373)

@cucaroach cucaroach merged commit fb4670b into release-23.1 May 3, 2023
@cucaroach cucaroach deleted the blathers/backport-release-23.1-99433 branch May 3, 2023 01:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants