Skip to content

executor: Fix tidb crash on index merge reader (#40904)#40978

Merged
ti-chi-bot merged 5 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-40904-to-release-6.5
Feb 6, 2023
Merged

executor: Fix tidb crash on index merge reader (#40904)#40978
ti-chi-bot merged 5 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-40904-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Feb 2, 2023

This is an automated cherry-pick of #40904

What problem does this PR solve?

Issue Number: close #40877

Problem Summary:

What is changed and how it works?

Let both pickAndExecTask and handlePickAndExecTaskPanic take the address of task as its argument, so once *task is assigned in pickAndExecTask, handlePickAndExecTaskPanic will get a non nil value.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@windtalker @ti-chi-bot
save work
6ba7b12 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker @ti-chi-bot
refine
302ab55 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@windtalker @ti-chi-bot
add more comments
decdc80 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 2, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • guo-shaoge

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.

Details

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 force-pushed the cherry-pick-40904-to-release-6.5 branch from 5504de8 to decdc80 Compare February 2, 2023 07:10
@ti-chi-bot ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 2, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 2, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Feb 2, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 2, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 6, 2023
@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 Feb 6, 2023
@guo-shaoge
Copy link
Collaborator

guo-shaoge commented Feb 6, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 6, 2023

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

DetailsCommit hash: a6b61d6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 6, 2023
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 6, 2023

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

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.

Details

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 df204de into pingcap:release-6.5 Feb 6, 2023
@windtalker windtalker mentioned this pull request Mar 7, 2023
Merged
16 tasks
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 13, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-40904-to-release-6.5 branch April 15, 2025 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@guo-shaoge guo-shaoge guo-shaoge approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

Assignees

@windtalker windtalker

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @guo-shaoge @XuHuaiyu @windtalker @VelocityLight