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

Revert "sql: add support for max/min aggregates on collated strings" #46693

Merged
merged 1 commit into from
Mar 27, 2020

Conversation

rohany
Copy link
Contributor

@rohany rohany commented Mar 27, 2020

Reverts #46647

As brought up by #46685, the simple change in #46647 is not enough. An investigation into why makes it seem like we need a decent refactor of the overload return type system. Because we type this aggregate with types.AnyCollatedStringFamily, we don't end up propagating the correct return type (the collation of the input) through to receivers of the aggregate's output. I think it is too late in the release to attempt such a refactor, so I'm going to revert this PR.

Release justification: Reverts a bug.
Release note (sql change): Remove the ability to perform min/max aggregates on collated strings.

@rohany rohany requested a review from yuzefovich March 27, 2020 19:39
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Reverts #46647

As brought up by #46685, the simple change in #46647 is not enough. An
investigation into why makes it seem like we need a decent refactor of
the overload return type system. Because we type this aggregate with
types.AnyCollatedStringFamily, we don't end up propagating the correct
return type (the collation of the input) through to receivers of the
aggregate's output. I think it is too late in the release to attempt
such a refactor, so I'm going to revert this PR.

Release justification: Reverts a bug.
Release note (sql change): Remove the ability to perform min/max
aggregates on collated strings.
@rohany rohany force-pushed the revert-46647-collated-string-max-min branch from 4fa1ab0 to 47f4996 Compare March 27, 2020 19:41
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.

:lgtm:

Please also reopen the original issue.

Reviewed 5 of 5 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rohany)


pkg/sql/rowexec/version_history.txt, line 112 at r1 (raw file):

      by older nodes. However, new nodes can process plans from older nodes,
      so MinAcceptedVersion is unchanged.
- Version: 29 (MinAcceptedVersion: 29)

Could you make sure that this commit wasn't included in any of the betas?

@rohany
Copy link
Contributor Author

rohany commented Mar 27, 2020

bors r=yuzefovich

@craig
Copy link
Contributor

craig bot commented Mar 27, 2020

Build failed (retrying...)

@craig
Copy link
Contributor

craig bot commented Mar 27, 2020

Build succeeded

@craig craig bot merged commit 1339b16 into master Mar 27, 2020
@jordanlewis jordanlewis deleted the revert-46647-collated-string-max-min branch December 23, 2020 05:30
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.

3 participants