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

executor,store/copr: fix index merge, distsql request's key ranges should be sorted #36633

Merged
merged 13 commits into from
Jul 29, 2022
Merged

executor,store/copr: fix index merge, distsql request's key ranges should be sorted #36633

merged 13 commits into from
Jul 29, 2022

Conversation

tiancaiamao
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #36632

Problem Summary:

What is changed and how it works?

The key range for distsql request should be sorted!
Because locate region for the key ranges use a binary search pattern.

Check List

Tests

  • Unit test
  • Integration test

This bug is found by our 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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 27, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • wshwsh12

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 27, 2022
@tiancaiamao tiancaiamao requested review from XuHuaiyu and wshwsh12 July 27, 2022 13:33
@tiancaiamao tiancaiamao marked this pull request as ready for review July 27, 2022 13:33
@ti-chi-bot ti-chi-bot added needs-cherry-pick-6.2 and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-triage-completed labels Jul 27, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 27, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/d4c3a10ce74a3e8cf72e2ffa7ebf8a81aa400177

wshwsh12
wshwsh12 reviewed Jul 27, 2022
View reviewed changes
store/copr/coprocessor.go Outdated Show resolved Hide resolved
@tiancaiamao tiancaiamao added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 28, 2022
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 28, 2022
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 29, 2022
@tiancaiamao tiancaiamao added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jul 29, 2022
@tiancaiamao
Copy link
Contributor Author

Verified in the integration test, now just keep the fixing part.
PTAL @hawkingrei @wshwsh12 @XuHuaiyu

tiancaiamao
tiancaiamao commented Jul 29, 2022
View reviewed changes
executor/distsql_test.go
@@ -581,3 +582,49 @@ func TestAdaptiveClosestRead(t *testing.T) {
// 2 IndexScan with cost 19/56, 2 TableReader with cost 32.5/65.
checkMetrics("select/* +USE_INDEX_MERGE(t) */ id from t use index(`idx_v_s1`) use index(idx_s2) where (s1 < 3 and v > 0) or s2 = 3;", 3, 1)
}

func TestCoprocessorPagingReqKeyRangeSorted(t *testing.T) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The added test can only cover (literally) the added code.
It can't prevent regression in the future when code changes.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 29, 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 Jul 29, 2022
@tiancaiamao
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b220e23

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 29, 2022
@ti-chi-bot ti-chi-bot merged commit 8b919bf into pingcap:master Jul 29, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 29, 2022
@tiancaiamao @ti-srebot
cherry pick pingcap#36633 to release-6.2
5d3f776 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jul 29, 2022
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-6.2 in PR #36704

@tiancaiamao tiancaiamao deleted the index-merge-paging branch July 29, 2022 05:54
@sre-bot
Copy link
Contributor

sre-bot commented Jul 29, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 28 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 24 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 20 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 22 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 13 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 55 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 44 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 4 min 11 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 6 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot pushed a commit that referenced this pull request Jul 29, 2022
@ti-srebot
executor,store/copr: fix index merge, distsql request's key ranges sh…
0610e40 
…ould be sorted (#36633) (#36704)

close #36632
@lcwangchao lcwangchao mentioned this pull request Apr 18, 2023
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@wshwsh12 wshwsh12 wshwsh12 approved these changes

@hawkingrei hawkingrei Awaiting requested review from hawkingrei

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

index merge dead loop when paging is used
7 participants
@tiancaiamao @ti-chi-bot @sre-bot @ti-srebot @hawkingrei @XuHuaiyu @wshwsh12