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

planner: generate correct number of rows when all agg funcs are pruned (#24937) #26039

Merged
merged 1 commit into from
Jul 14, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jul 8, 2021

cherry-pick #24937 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/26039

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/26039:release-4.0-ad7102cdeedf

What problem does this PR solve?

Issue Number: close #24865

Problem Summary:

Wrong query result.

What is changed and how it works?

What's Changed:
If all aggregation funcs are pruned during logical optimization, keep a count(1) instead of first_row(1) if the original LogicalAggregation contains agg funcs other than first_row().

How it Works:
See the code comments for explanations.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

N/A

Release note

  • Generate correct number of rows when all agg funcs are pruned

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Jul 8, 2021
@ti-srebot ti-srebot added this to the v4.0.13 milestone Jul 8, 2021
@ti-srebot
Copy link
Contributor Author

@eurekaka you're already a collaborator in bot's repo.

Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

@eurekaka Please resolve conflicts.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 14, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lzmhhh123
  • winoros

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 14, 2021
@eurekaka
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: b5bc5e6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 14, 2021
@ti-chi-bot ti-chi-bot merged commit eb80993 into pingcap:release-4.0 Jul 14, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.13, v4.0.14 Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants