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 CTE bug when used with Apply #31256

Merged
merged 15 commits into from
Jan 6, 2022

Conversation

guo-shaoge
Copy link
Collaborator

@guo-shaoge guo-shaoge commented Jan 3, 2022

What problem does this PR solve?

Issue Number: close #31255

Problem Summary: No handling for Apply.

What is changed and how it works?

Add IsInApply in CTEClass to indicates whether CTE is the inner plan of Apply. If it is, CTEExec.resTbl and CTEExec.iterInTbl will be reset for each outer row of Apply.

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 CTE bug when used with Apply

Signed-off-by: guo-shaoge <shaoge1994@163.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 3, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qw4990
  • 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 release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 3, 2022
@guo-shaoge
Copy link
Collaborator Author

/cc @wjhuang2016

@ti-chi-bot ti-chi-bot requested a review from wjhuang2016 January 3, 2022 14:21
Signed-off-by: guo-shaoge <shaoge1994@163.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Copy link
Collaborator Author

/run-unit-test

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@@ -1392,7 +1392,7 @@ func (s *testPrepareSerialSuite) TestCTE4PlanCache(c *C) {
tk.MustExec("set @a=1, @b=2, @c=3, @d=4, @e=5, @f=0;")

tk.MustQuery("execute stmt using @f, @a, @f").Check(testkit.Rows("1"))
tk.MustQuery("execute stmt using @a, @b, @a").Check(testkit.Rows("1"))
tk.MustQuery("execute stmt using @a, @b, @a").Sort().Check(testkit.Rows("1", "2"))
tk.MustQuery("select @@last_plan_from_cache;").Check(testkit.Rows("0"))
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The correct result is '1 2':

drop table if exists t1;
create table t1(a int);
insert into t1 values(1);
insert into t1 values(2);
SELECT * FROM t1 dt WHERE EXISTS(WITH RECURSIVE qn AS (SELECT a*1 AS b UNION ALL SELECT b+2 FROM qn WHERE b=1) SELECT * FROM qn WHERE b=a);

@guo-shaoge
Copy link
Collaborator Author

/run-unit-test

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 4, 2022
@guo-shaoge
Copy link
Collaborator Author

/cc @qw4990

@ti-chi-bot ti-chi-bot requested a review from qw4990 January 4, 2022 09:15
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jan 4, 2022

@guo-shaoge
Copy link
Collaborator Author

/run-check_dev_2

@guo-shaoge guo-shaoge requested a review from wjhuang2016 January 5, 2022 07:52
@guo-shaoge
Copy link
Collaborator Author

/run-mysql-test

@guo-shaoge guo-shaoge added needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Jan 6, 2022
@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 Jan 6, 2022
@guo-shaoge
Copy link
Collaborator Author

/run-mysql-test
/run-unit-test

@wjhuang2016
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6fea0fe

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 6, 2022
@guo-shaoge
Copy link
Collaborator Author

/run-check_dev_2
/run-unit-test

@guo-shaoge
Copy link
Collaborator Author

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit f7cc15f into pingcap:master Jan 6, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 6, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #31380

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 6, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #31381

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 6, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #31382

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 6, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #31383

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 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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.

CTE doesn't handle apply properly
6 participants