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.

Sign up for GitHub

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

Jump to bottom

*: fix bug of same type plans with different plan ... (#19519) #19684

Merged
merged 6 commits into from
Sep 2, 2020
Merged

*: fix bug of same type plans with different plan ... (#19519) #19684

merged 6 commits into from
Sep 2, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #19519 to release-4.0

Signed-off-by: crazycs520 crazycs520@gmail.com

What problem does this PR solve?

close #19516.

What is changed and how it works?

The cause of same type plan with different digest is:

  1. The Plan ID of plan may be changed, we should ignore the plan ID when normalized plan.
  2. The Column Unique ID maybe also changed, we should also ignore the column unique id when normalized column info.
  3. Fix the PhysicalIndexScan implementation of PhysicalIndexJoin, PhysicalTableReader , PhysicalIndexScan , basePhysicalAgg.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • No

Release note

  • Fix issue of same type plans with different plan digest.

@crazycs520 @ti-srebot
cherry pick pingcap#19519 to release-4.0
5eef6bb 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Sep 1, 2020
Merged
@ti-srebot ti-srebot added this to the v4.0.6 milestone Sep 1, 2020
zz-jason
zz-jason reviewed Sep 1, 2020
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

@crazycs520 please resolve the conflicts.

@crazycs520
fix conflict
57c19f2 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
AilinKid
AilinKid reviewed Sep 2, 2020
View reviewed changes
Copy link
Contributor

@AilinKid AilinKid 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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 2, 2020
tangenta
tangenta reviewed Sep 2, 2020
View reviewed changes
Copy link
Contributor

@tangenta tangenta 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-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 2, 2020
zz-jason
zz-jason approved these changes Sep 2, 2020
View reviewed changes
Copy link
Member

@zz-jason zz-jason 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-srebot ti-srebot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Sep 2, 2020
@zz-jason
Copy link
Member

zz-jason commented Sep 2, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 2, 2020
@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 19692
  • 19269

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@zz-jason
Copy link
Member

zz-jason commented Sep 2, 2020

/run-sqllogic-test-1

@zz-jason
Copy link
Member

zz-jason commented Sep 2, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 17924
  • 18115
  • 18164
  • 18327
  • 19264
  • 19664
  • 19672
  • 19682

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@zz-jason zz-jason changed the title *: fix bug of same type plans with different plan digest (#19519) *: fix bug of same type plans with different plan ... (#19519) Sep 2, 2020
@zz-jason zz-jason merged commit f3c573b into pingcap:release-4.0 Sep 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid left review comments

@tangenta tangenta tangenta left review comments

@zz-jason zz-jason zz-jason approved these changes

@djshow832 djshow832 Awaiting requested review from djshow832

@lzmhhh123 lzmhhh123 Awaiting requested review from lzmhhh123

@winoros winoros Awaiting requested review from winoros

Assignees

@crazycs520 crazycs520

Labels
component/expression sig/planner SIG: Planner status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/bug-fix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.6
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ti-srebot @zz-jason @AilinKid @tangenta @crazycs520