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

util, executor: use UnionRanges build index kv range for INLJ (#15727) #15754

Merged
merged 5 commits into from
Apr 15, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Mar 27, 2020

cherry-pick #15727 to release-3.1


What problem does this PR solve?

Issue Number: close #15686
close #15693
close #15687

Problem Summary:
Before this commit, we build a wrong kv ranges which will cause data lost when index join fetchInnerResult.

What is changed and how it works?

What's Changed:
Use UnionRanges to merge ranges.

How it Works:

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

  • Performance regression
    • Consumes more CPU

Release note

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 27, 2020

/run-all-tests

@sre-bot sre-bot added sig/execution SIG execution sig/planner SIG: Planner priority/release-blocker This issue blocks a release. Please solve it ASAP. status/PTAL type/3.1-cherry-pick type/bugfix This PR fixes a bug. labels Mar 27, 2020
@XuHuaiyu XuHuaiyu removed the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Mar 27, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 29, 2020

@SunRunAway, @eurekaka, @fzhedu, @winoros, PTAL.

1 similar comment
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 31, 2020

@SunRunAway, @eurekaka, @fzhedu, @winoros, PTAL.

Copy link
Contributor

@fzhedu fzhedu left a comment

Choose a reason for hiding this comment

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

please address conflicts.

@@ -906,7 +906,82 @@ func (s *testSuite2) TestIndexLookupJoin(c *C) {
tk.MustQuery("select /*+ TIDB_INLJ(s) */ count(*) from t join s use index(idx) on s.a = t.a and s.b < t.b").Check(testkit.Rows("64"))
}

<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

please address conflicts @XuHuaiyu

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 4, 2020

@fzhedu, @SunRunAway, @eurekaka, @winoros, PTAL.

2 similar comments
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 6, 2020

@fzhedu, @SunRunAway, @eurekaka, @winoros, PTAL.

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 9, 2020

@fzhedu, @SunRunAway, @eurekaka, @winoros, PTAL.

@XuHuaiyu
Copy link
Contributor

/run-all-tests

Copy link
Contributor

@eurekaka eurekaka left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@winoros winoros left a comment

Choose a reason for hiding this comment

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

lgtm

@XuHuaiyu XuHuaiyu added the status/LGT2 Indicates that a PR has LGTM 2. label Apr 14, 2020
@XuHuaiyu
Copy link
Contributor

@zz-jason
can merge

@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. and removed status/PTAL labels Apr 15, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 15, 2020

Your auto merge job has been accepted, waiting for 15753

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 15, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 15, 2020

@sre-bot merge failed.

@zz-jason
Copy link
Member

/run-integration-common-test

@zz-jason zz-jason merged commit ba735e9 into pingcap:release-3.1 Apr 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/execution SIG execution sig/planner SIG: Planner status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/3.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants