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-22.2: main: update optgen Op alias to match current memo group member #94423

Merged
merged 1 commit into from
Dec 30, 2022

Conversation

msirek
Copy link
Contributor

@msirek msirek commented Dec 29, 2022

Backport 1/1 commits from #94112.

/cc @cockroachdb/release


Fixes #94042

This fixes a slightly confusing feature of optgen where an alias in a match rule is assigned to the first expression in the group, and may be of a different expression type than the allowed Ops in the match rule.

Example:

[GenerateStreamingGroupByLimitOrderingHint, Explore]
(Limit
    $aggregation:(GroupBy | DistinctOn

Given this match rule snippet, it looks like $aggregation can only be a GroupBy or DistinctOn expression. But in #94042, it is sometimes a Select expression. The variable is later used to generate a new expression with the assumption it is one of the allowed Op types, causing a panic.

This is fixed by updating the optgen rule gen code to keep the alias up-to-date with the current memo group member being examined in the match rule, as it cycles through all members in the group.

Release note: None

Release Justification: Low risk prerequisite for possible backport of #93858

Fixes cockroachdb#94042

This fixes a slightly confusing feature of optgen where an alias in
a match rule is assigned to the first expression in the group, and
may be of a different expression type than the allowed Ops in the
match rule.

Example:
```
[GenerateStreamingGroupByLimitOrderingHint, Explore]
(Limit
    $aggregation:(GroupBy | DistinctOn
```
Given this match rule, it looks like `$aggregation` can only be a
GroupBy or DistinctOn expression. But in cockroachdb#94042, it is sometimes a
Select expression. The variable is later used to generate a new
expression with the assumption it is one of the allowed Op types,
causing a panic.

This is fixed by updating the optgen rule gen code to keep the alias
up-to-date with the current memo group member being examined in the
match rule, as it cycles through all members in the group.

Release note: None
@msirek msirek requested a review from a team as a code owner December 29, 2022 17:01
@blathers-crl
Copy link

blathers-crl bot commented Dec 29, 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?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@DrewKimball DrewKimball left a comment

Choose a reason for hiding this comment

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

:lgtm:

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

@msirek msirek merged commit 1af184f into cockroachdb:release-22.2 Dec 30, 2022
@msirek msirek deleted the backport22.2-94112 branch December 30, 2022 00:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants