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-21.2: opt: don't panic on negated geospatial comparison operator #84629

Merged
merged 1 commit into from Jul 28, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jul 19, 2022

Backport 1/1 commits from #84524 on behalf of @DrewKimball.

/cc @cockroachdb/release


Previously, the NegateComparison rule could match geospatial
comparison operators like ~. This would lead to a panic when the
rule attempted to construct the negated version of the expression,
since there is no negation for ~ and other geospatial comparisons.

This patch modifies NegateComparison to directly check
opt.NegateOpMap to ensure that a comparison can be negated before
matching the expression.

Fixes #84476

Release note (bug fix): Fixed a bug introduced in 20.2 that could
cause a panic when an expression contained a geospatial comparison
like ~ that was negated.


Release justification:

Previously, the `NegateComparison` rule could match geospatial
comparison operators like `~`. This would lead to a panic when the
rule attempted to construct the negated version of the expression,
since there is no negation for `~` and other geospatial comparisons.

This patch modifies `NegateComparison` to directly check
`opt.NegateOpMap` to ensure that a comparison can be negated before
matching the expression.

Fixes #84476

Release note (bug fix): Fixed a bug introduced in 20.2 that could
cause a panic when an expression contained a geospatial comparison
like `~` that was negated.
@blathers-crl blathers-crl bot requested a review from a team as a code owner July 19, 2022 00:49
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-21.2-84524 branch from c084700 to cab4562 Compare July 19, 2022 00:49
@blathers-crl blathers-crl bot requested a review from rytaft July 19, 2022 00:49
@blathers-crl
Copy link
Author

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

This change is Reviewable

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

@DrewKimball
Copy link
Collaborator

TFTR!

@DrewKimball DrewKimball merged commit 22d36e2 into release-21.2 Jul 28, 2022
@DrewKimball DrewKimball deleted the blathers/backport-release-21.2-84524 branch July 28, 2022 23:54
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.

None yet

3 participants