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-24.1: sql/types: preserve tuple labels in (*T).WithoutTypeModifiers #142137

Merged
merged 1 commit into from
Feb 28, 2025

Conversation

mgartner
Copy link
Collaborator

@mgartner mgartner commented Feb 28, 2025

Backport 1/1 commits from #138791.

/cc @cockroachdb/release


Previously, the WithoutTypeModifiers method incorrectly removed tuple
labels from the returned type. This has been fixed.

Fixes #136167

Release note (bug fix): A bug has been fixed that disregarded tuple
labels in some cases. This could cause unexpected behavior, such as when
converting a tuple to JSON with to_jsonb. See #136167 for more
details. The incorrect removal of tuple labels bug was introduced in
v22.1.0, and changes in v24.1.7 made unexpected behavior due to the bug
more likely.


Release justification: Minor bug fix.

@mgartner mgartner requested review from a team and yuzefovich and removed request for a team February 28, 2025 15:38
@mgartner mgartner requested a review from a team as a code owner February 28, 2025 15:38
Copy link

blathers-crl bot commented Feb 28, 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 added the backport Label PR's that are backports to older release branches label Feb 28, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@mgartner mgartner requested a review from michae2 February 28, 2025 15:46
Copy link
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @michae2)


-- commits line 13 at r1:
nit: mention 24.1.7 version.

Previously, the `WithoutTypeModifiers` method incorrectly removed tuple
labels from the returned type. This has been fixed.

Fixes cockroachdb#136167

Release note (bug fix): A bug has been fixed that disregarded tuple
labels in some cases. This could cause unexpected behavior, such as when
converting a tuple to JSON with `to_jsonb`. See cockroachdb#136167 for more
details. The incorrect removal of tuple labels bug was introduced in
v22.1.0, and changes in v24.1.7 made unexpected behavior due to the bug
more likely.
@mgartner mgartner force-pushed the backport24.1-138791 branch from 2888626 to de57c8e Compare February 28, 2025 17:59
Copy link
Collaborator Author

@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.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @michae2)


-- commits line 13 at r1:

Previously, yuzefovich (Yahor Yuzefovich) wrote…

nit: mention 24.1.7 version.

Done

@mgartner mgartner merged commit 63156fc into cockroachdb:release-24.1 Feb 28, 2025
15 of 16 checks passed
@mgartner mgartner deleted the backport24.1-138791 branch February 28, 2025 20:54
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 target-release-24.1.15
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants