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

ddl: correct the remain ranges check for adding index #41460

Merged
merged 6 commits into from
Feb 16, 2023
Merged

ddl: correct the remain ranges check for adding index #41460

merged 6 commits into from
Feb 16, 2023

Conversation

tangenta
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #41459

Problem Summary:

The condition remains == 0 does not indicate the whole task is finished after #40411.

What is changed and how it works?

Correct the remain check code.

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

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 Feb 15, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Benjamin2037
  • zimulala

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-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 15, 2023
@tangenta tangenta added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Feb 15, 2023
zimulala
zimulala reviewed Feb 15, 2023
View reviewed changes
ddl/backfilling.go Outdated
@@ -1067,12 +1072,18 @@ func (dc *ddlCtx) writePhysicalTableRecord(sessPool *sessionPool, t table.Physic
}

for {
if startKey.Cmp(endKey) >= 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we remove this check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, kvRanges[len(kvRanges)-1].EndKey may equal to endKey.

The function splitTableRanges() doesn't handle the cases like start_key <= end_key.

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

is above start_key > end_key scenario for splitTableRanges() not handle?

Copy link
Contributor

Choose a reason for hiding this comment

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

It handles in line1082

Copy link
Collaborator

Choose a reason for hiding this comment

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

My question is if we send a smaller start_key to `splitTableRanges(), will it return an err?

zimulala
zimulala reviewed Feb 15, 2023
View reviewed changes
tests/realtikvtest/addindextest/integration_test.go Show resolved Hide resolved
ddl/backfilling.go Outdated
@@ -1067,12 +1072,18 @@ func (dc *ddlCtx) writePhysicalTableRecord(sessPool *sessionPool, t table.Physic
}

for {
if startKey.Cmp(endKey) >= 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

Got it.

zimulala
zimulala approved these changes Feb 15, 2023
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 15, 2023
Benjamin2037
Benjamin2037 approved these changes Feb 15, 2023
View reviewed changes
Copy link
Collaborator

@Benjamin2037 Benjamin2037 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-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 Feb 15, 2023
wjhuang2016
wjhuang2016 reviewed Feb 15, 2023
View reviewed changes
ddl/backfilling.go Outdated Show resolved Hide resolved
@tangenta
Copy link
Contributor Author

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 16, 2023
@tangenta
Copy link
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 16, 2023
@tangenta
Copy link
Contributor Author

/test unit-test

@tangenta
Copy link
Contributor Author

/retest

@tangenta
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3a70491

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 16, 2023
@ti-chi-bot ti-chi-bot merged commit 9df59ea into pingcap:master Feb 16, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 16, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #41493.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 16, 2023
@tangenta @ti-chi-bot
This is an automated cherry-pick of pingcap#41460
544dcfb 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 16, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.6: #41494.

ti-chi-bot added a commit that referenced this pull request Feb 16, 2023
@ti-chi-bot
ddl: correct the remain ranges check for adding index (#41460) (#41494)
8a40c4d 
close #41459
ti-chi-bot added a commit that referenced this pull request Feb 16, 2023
@ti-chi-bot
ddl: correct the remain ranges check for adding index (#41460) (#41493)
5981894 
close #41459
zimulala pushed a commit to zimulala/tidb that referenced this pull request Feb 18, 2023
@ti-chi-bot @zimulala
ddl: correct the remain ranges check for adding index (pingcap#41460) (…
009905c 
…pingcap#41494)

close pingcap#41459
zimulala pushed a commit to zimulala/tidb that referenced this pull request Feb 21, 2023
@ti-chi-bot @zimulala
ddl: correct the remain ranges check for adding index (pingcap#41460) (…
ee05a35 
…pingcap#41494)

close pingcap#41459
zimulala pushed a commit to zimulala/tidb that referenced this pull request Feb 23, 2023
@ti-chi-bot @zimulala
ddl: correct the remain ranges check for adding index (pingcap#41460) (…
61ef32d 
…pingcap#41494)

close pingcap#41459
iosmanthus pushed a commit to iosmanthus/tidb that referenced this pull request Feb 28, 2023
@ti-chi-bot @iosmanthus
ddl: correct the remain ranges check for adding index (pingcap#41460) (…
1f05f41 
…pingcap#41494)

close pingcap#41459
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

@zimulala zimulala zimulala approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. 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 records incomplete after adding index for a large table
5 participants
@tangenta @ti-chi-bot @zimulala @Benjamin2037 @wjhuang2016