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

executor: group_concat aggr panic when session.group_concat_max_len is small (#23131) #23257

Merged
merged 4 commits into from
May 10, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 11, 2021

cherry-pick #23131 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/23257

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

git push git@github.com:ti-srebot/tidb.git pr/23257:release-4.0-b298b86ba164

Signed-off-by: guo-shaoge shaoge1994@163.com

What problem does this PR solve?

Issue Number: close #23129

Problem Summary:

drop table if exists t1;
create table t1(cid int, sname varchar(100));
insert into t1 values(1, 'Bob'), (1, 'Alice');
insert into t1 values(3, 'Ace');
set @@group_concat_max_len=5;
select group_concat(sname order by sname) from t1 group by cid;

What is changed and how it works?

What's Changed: when concat all strings from a group(AppendFinalResult2Chunk), we add the last separator to result, and then truncate to sesssion.group_concat_max_len. But we forgot to check if the concated string is shorter than sesssion.group_concat_max_len. So program panic.

PS: Another compatible bug found when fixing this bug, but it's not critical. Will fix in another issue.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test: Add test in aggregate_test.go::TestGroupConcatAggr()

Side effects: no

Release note

  • group_concat aggr panic when session.group_concat_max_len is small.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Mar 11, 2021
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 11, 2021
@ti-srebot
Copy link
Contributor Author

@guo-shaoge you're already a collaborator in bot's repo.

@XuHuaiyu
Copy link
Contributor

/LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 11, 2021
@guo-shaoge
Copy link
Collaborator

/run-unit-test

@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 30, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@zhouqiang-cl: /merge in this pull request requires 2 /lgtm.

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.

@wshwsh12
Copy link
Contributor

wshwsh12 commented May 7, 2021

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • wshwsh12

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 May 7, 2021
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 7526894

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 10, 2021
@guo-shaoge
Copy link
Collaborator

/run-unit-test

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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 ti-chi-bot merged commit 842e180 into pingcap:release-4.0 May 10, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.13 May 17, 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/execution SIG execution size/M Denotes a PR that changes 30-99 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