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.

Sign up for GitHub

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

Jump to bottom

release-22.2: opt: copy ColSet in CreateLocalityOptimizedLookupJoinPrivateIncludingCols #88175

Merged
merged 1 commit into from
Sep 20, 2022
Merged

release-22.2: opt: copy ColSet in CreateLocalityOptimizedLookupJoinPrivateIncludingCols #88175

merged 1 commit into from
Sep 20, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 19, 2022 •
edited by mgartner
Loading

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

/cc @cockroachdb/release

CreateLocalityOptimizedLookupJoinPrivateIncludingCols was mutating a
opt.ColSet field of another LookupJoinPrivate because it was calling
ColSet.UnionWith without copying the ColSet first. This commit fixes
the bug.

Fixes #88126

Release note: None

Release justification: This is a critical fix for a correctness bug.

@mgartner
opt: copy ColSet in CreateLocalityOptimizedLookupJoinPrivateIncluding…
2e731c7 
…Cols

`CreateLocalityOptimizedLookupJoinPrivateIncludingCols` was mutating a
`opt.ColSet` field of another `LookupJoinPrivate` because it was calling
`ColSet.UnionWith` without copying the `ColSet` first. This commit fixes
the bug.

Fixes #88126

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner September 19, 2022 21:28
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-88129 branch from 629fb1c to 2e731c7 Compare September 19, 2022 21:28
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 19, 2022

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 requested review from michae2, msirek and rytaft September 19, 2022 21:28
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 19, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

michae2
michae2 approved these changes Sep 19, 2022
View reviewed changes
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 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @msirek and @rytaft)

rytaft
rytaft approved these changes Sep 20, 2022
View reviewed changes
Copy link
Collaborator

@rytaft rytaft 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 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @msirek)

@mgartner mgartner merged commit 2040dae into release-22.2 Sep 20, 2022
@mgartner mgartner deleted the blathers/backport-release-22.2-88129 branch September 20, 2022 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michae2 michae2 michae2 approved these changes

@rytaft rytaft rytaft approved these changes

@msirek msirek Awaiting requested review from msirek

Assignees

@mgartner mgartner

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cockroach-teamcity @rytaft @michae2 @mgartner