Skip to content

release-24.1: sql/schemachanger: fix nil pointer preparing a schema changer statement #147668

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

Merged
merged 1 commit into from
Jun 3, 2025

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 2, 2025

Backport 1/1 commits from #147658 on behalf of @fqazi.


Previously, the code to track if a plan was using the declarative or legacy schema changer updated the instrumentation based on curPlan. This worked correctly if a previous statement was executed and the instrumentation was set up on that plan. However, if a PREPARE is the first statement on a connection, this breaks. To address this, this patch updates the planner's instrumentation to track if a statement is a declarative schema change.

Fixes: #146907
Informs: #147271
Fixes: #147256
Informs: #147251
Fixes: #145305

Release note (bug fix): Prepare statements on schema changes could fail with runtime errors.


Release justification: low risk fix for a bug that can cause PREPARE statements with schema changes to hit runtime errors.

Previously, the code to track if a plan was using the declarative or
legacy schema changer updated the instrumentation based on curPlan. This
worked correctly if a previous statement was executed and the
instrumentation was set up on that plan. However, if a PREPARE is the
first statement on a connection, this breaks. To address this, this
patch updates the planner's instrumentation to track if a statement is a
declarative schema change.

Fixes: #146907
Fixes: #147271
Fixes: #147256
Fixes: #147251
Fixes: #145305

Release note (bug fix): Prepare statements on schema changes could fail
with runtime errors.
@blathers-crl blathers-crl bot requested a review from a team as a code owner June 2, 2025 23:00
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.1-147658 branch from 9826425 to abc24e7 Compare June 2, 2025 23:00
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 2, 2025
Copy link
Author

blathers-crl bot commented Jun 2, 2025

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. 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 requested a review from rafiss June 2, 2025 23:00
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jun 2, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@fqazi fqazi merged commit bdbe9f9 into release-24.1 Jun 3, 2025
15 checks passed
@fqazi fqazi deleted the blathers/backport-release-24.1-147658 branch June 3, 2025 16:16
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. target-release-24.1.20
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants