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

expression: fix IN expr critical bug (#25653) #25666

Merged
merged 4 commits into from
Jun 25, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 22, 2021

cherry-pick #25653 to release-5.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/25666

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

git push git@github.com:ti-srebot/tidb.git pr/25666:release-5.0-ea1a1e79c5f4

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

What problem does this PR solve?

Issue Number: close #25591

Problem Summary: The implementation of IN expr will change its arguments array unexpectedly. For example:

t1.c1 IN (1, t2.c1, t2.c2);
original args: (t1.c1, 1, t2.c1, t2.c2)
after: (t1.c1, t2.c1, t2.c2, t2.c2)

What is changed and how it works?

What's Changed: If we need to change local args slice, make a new underlying array instead of changing the expr's(b.args should not be changed)

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects: May use extra memory to store local arguments array.

Release note

  • expression: fix IN expr critical bug

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-srebot ti-srebot requested a review from a team as a code owner June 22, 2021 09:14
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team June 22, 2021 09:14
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added component/expression size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Jun 22, 2021
@ti-srebot ti-srebot requested a review from XuHuaiyu June 22, 2021 09:14
@ti-srebot ti-srebot added this to the v5.0.2 milestone Jun 22, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 22, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 25, 2021
Copy link
Contributor

@XuHuaiyu XuHuaiyu 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 the status/LGT1 Indicates that a PR has LGTM 1. label Jun 25, 2021
@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 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 Jun 25, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d55d071

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 25, 2021
@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 4246444 into pingcap:release-5.0 Jun 25, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.2, v5.0.3 Jun 28, 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. component/expression 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/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants