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

planner: fix incorrect maintenance of handleColHelper for recursive CTE (#55732) #55896

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #55732

What problem does this PR solve?

Issue Number: close #55666

Problem Summary:

If the recursive part of a CTE references tables other than the CTE itself, the b.handleHelper won't be correctly cleared during buildRecursiveCTE().

It's because this function relies on an error from buildSelect() or buildSetOpr() to recognize the boundary between the seed part and the recursive part. But b.handleHelper won't be cleared when an error happens.

When this happens, there will be some wrong and redundant entries in b.handleHelper, which makes users of this field like buildDelete() get the wrong result or panic.

What changed and how does it work?

Since this PR needs to be cherry-picked, I can't change too many.

  • In buildRecursiveCTE(), clear the b.handleHelper if an error is returned from buildSelect() or buildSetOpr().
  • Try to make the b.handleHelper more clear for recursive CTE:
    • Now tryBuildCTE() will always push an entry into handleHelper when successful.
    • Now buildRecursiveCTE() will always push an entry into handleHelper when successful.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Sep 6, 2024
@ti-chi-bot ti-chi-bot added sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 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 Sep 6, 2024
@time-and-fate
Copy link
Member

/retest

Copy link

codecov bot commented Sep 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-6.5@973b215). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #55896   +/-   ##
================================================
  Coverage               ?   73.7272%           
================================================
  Files                  ?       1097           
  Lines                  ?     353092           
  Branches               ?          0           
================================================
  Hits                   ?     260325           
  Misses                 ?      76115           
  Partials               ?      16652           

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Sep 6, 2024
Copy link

ti-chi-bot bot commented Sep 6, 2024

@Rustin170506: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added the lgtm label Sep 6, 2024
Copy link

ti-chi-bot bot commented Sep 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Rustin170506, time-and-fate, winoros

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [time-and-fate,winoros]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 6, 2024
Copy link

ti-chi-bot bot commented Sep 6, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-09-06 09:21:41.023967538 +0000 UTC m=+2570.764391477: ☑️ agreed by winoros.
  • 2024-09-06 09:57:37.323064423 +0000 UTC m=+4727.063488363: ☑️ agreed by time-and-fate.

@ti-chi-bot ti-chi-bot bot merged commit be82a7d into pingcap:release-6.5 Sep 6, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants