release-21.1: opt: do not provide project ordering for columns removed when simplified #64481
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
|
Do not merge until 21.1.1. |
|
I'll have to rebase once #64348 is merged to get the tests passing here. |
rytaft
approved these changes
May 3, 2021
There was a problem hiding this comment.
Reviewed 3 of 3 files at r1.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde)
Previously, `projectCanProvideOrdering` did not simplify an ordering base on an FD set if the original ordering could be provided, while `projectBuildChildReqOrdering` always attempted to simplify an ordering. In cockroachdb#64342 the behavior of `OrderingChoice.Simplify` changed to remove columns in groups that are not known to be equivalent by the FD. As a result, `projectCanProvideOrdering` could return true in cases where the simplified ordering, with some columns removed, could not be provided, causing `ordering.projectBuildChildReqOrdering` to panic. This commit updates `ordering.projectCanProvideOrdering` so that the ordering is always simplified, matching the behavior of `ordering.projectBuildChildReqOrdering`. Fixes cockroachdb#64399 Release note: None
mgartner
force-pushed
the
backport21.1-64444
branch
from
b0bb494 to
6b69e94
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/1 commits from #64444.
/cc @cockroachdb/release
Previously,
projectCanProvideOrderingdid not simplify an orderingbase on an FD set if the original ordering could be provided, while
projectBuildChildReqOrderingalways attempted to simplify an ordering.In #64342 the behavior of
OrderingChoice.Simplifychanged to removecolumns in groups that are not known to be equivalent by the FD. As a
result,
projectCanProvideOrderingcould return true in cases where thesimplified ordering, with some columns removed, could not be provided,
causing
ordering.projectBuildChildReqOrderingto panic.This commit updates
ordering.projectCanProvideOrderingso that theordering is always simplified, matching the behavior of
ordering.projectBuildChildReqOrdering.Fixes #64399
Release note: None