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: fix a bug that cte.iterOutTbl did not close correctly #26129

Merged
merged 6 commits into from
Jul 12, 2021

Conversation

guo-shaoge
Copy link
Collaborator

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

What problem does this PR solve?

Issue Number: close #26112

Problem Summary: cte.iterOutTbl didn't close correctly. When recursiveExec is nil, cte.iterOutTbl should not be closed.

What is changed and how it works?

What's Changed:

  1. In builder.go, if recursiveExec is nil, donot create iterOutTbl.
  2. In CTEExec.Next(), if recursiveExec is nil, donot setup memory tracker for iterOutTbl.
  3. In CTEExec.Close(), if recursiveExec is nil, donot close iterOutTbl.

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

  • executor: fix a bug that cte.iterOutTbl did not close correctly

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 12, 2021
@guo-shaoge
Copy link
Collaborator Author

/run-integration-common-test
/run-integration-copr-test
/run-integration-test

@guo-shaoge
Copy link
Collaborator Author

/label needs-cherry-pick-5.1

@guo-shaoge
Copy link
Collaborator Author

/run-check_dev_2

@github-actions github-actions bot added the sig/execution SIG execution label Jul 12, 2021
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 12, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lzmhhh123
  • wjhuang2016

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 12, 2021
@lzmhhh123
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4203ab5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 12, 2021
@ti-chi-bot ti-chi-bot merged commit 7ee78d1 into pingcap:master Jul 12, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 12, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #26148

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.1 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A recursive CTE causes TiDB server panic
5 participants