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.

Sign up for GitHub

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

Jump to bottom

set empty_result_for_aggregation_by_empty_set according to AggregateFuncMode (#3822) #4012

Merged
merged 5 commits into from
Jul 14, 2022
Merged

set empty_result_for_aggregation_by_empty_set according to AggregateFuncMode (#3822) #4012

merged 5 commits into from
Jul 14, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3822

What problem does this PR solve?

Issue Number: close pingcap/tidb#30923

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@XuHuaiyu @ti-chi-bot
This is an automated cherry-pick of pingcap#3822
7f3d84f 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 14, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • windtalker

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels Feb 14, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 14, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added affects-4.0 affects-5.0 affects-5.1 affects-5.2 affects-5.3 affects-5.4 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR. labels Feb 14, 2022
@CLAassistant
Copy link

CLAassistant commented Apr 2, 2022 •
edited by sre-bot
Loading

CLA assistant check
All committers have signed the CLA.

@JaySon-Huang JaySon-Huang added this to the v5.4.1 milestone Apr 28, 2022
@JaySon-Huang JaySon-Huang modified the milestones: v5.4.1, v5.4.2 Jun 4, 2022
windtalker and others added 3 commits July 1, 2022 14:11
@windtalker
Merge branch 'release-5.4' into cherry-pick-3822-to-release-5.4
b7b8f61
@windtalker
resolve conflict
ac4f424 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
fix build
e182996 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 1, 2022
@windtalker
fix build
c1b1112 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker
Copy link
Contributor

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Jul 1, 2022

lines: 43.5% (50300 out of 115511)
branches: 6.5% (82316 out of 1266353)

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 4, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 13, 2022
@windtalker
Copy link
Contributor

/rebuild

@windtalker
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@windtalker: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

@windtalker: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

windtalker
windtalker approved these changes Jul 14, 2022
View reviewed changes
Copy link
Contributor

@windtalker windtalker left a comment

Choose a reason for hiding this comment

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

LGTM

@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, 2022
@windtalker
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@windtalker: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

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

Commit hash: c1b1112

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 14, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jul 14, 2022

lines: 43.5% (50299 out of 115511)
branches: 6.5% (82319 out of 1266353)

@sre-bot
Copy link
Collaborator

sre-bot commented Jul 14, 2022

lines: 43.5% (50299 out of 115511)
branches: 6.5% (82313 out of 1266353)

@ti-chi-bot ti-chi-bot merged commit d5e5a83 into pingcap:release-5.4 Jul 14, 2022
@JaySon-Huang JaySon-Huang modified the milestones: v5.4.2, v5.4.3 Sep 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@windtalker windtalker windtalker approved these changes

Assignees

@XuHuaiyu XuHuaiyu

Labels
affects-4.0 affects-5.0 affects-5.1 affects-5.2 affects-5.3 affects-5.4 cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Milestone
v5.4.3
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-chi-bot @CLAassistant @windtalker @sre-bot @XuHuaiyu @JaySon-Huang @VelocityLight