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

br: merge range in lightweight when snapshot restore #50648

Merged
merged 4 commits into from
Feb 2, 2024

Conversation

Leavrth
Copy link
Contributor

@Leavrth Leavrth commented Jan 23, 2024

What problem does this PR solve?

Issue Number: close #50613

Problem Summary:
Merge file ranges takes too much time when the file ranges's size is much large.

What changed and how does it work?

use the O(n) algorithm

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: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-triage-completed do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/needs-tests-checked labels Jan 23, 2024
Copy link

tiprow bot commented Jan 23, 2024

Hi @Leavrth. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

Copy link

codecov bot commented Jan 23, 2024

Codecov Report

Merging #50648 (0af9381) into master (1db1587) will decrease coverage by 1.2567%.
Report is 102 commits behind head on master.
The diff coverage is 22.2222%.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #50648        +/-   ##
================================================
- Coverage   72.1179%   70.8612%   -1.2567%     
================================================
  Files          1454       1463         +9     
  Lines        347571     437040     +89469     
================================================
+ Hits         250661     309692     +59031     
- Misses        76542     106543     +30001     
- Partials      20368      20805       +437     
Flag Coverage Δ
integration 48.8914% <22.2222%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 56.3129% <ø> (ø)
parser ∅ <ø> (∅)
br 52.6591% <22.2222%> (+0.4787%) ⬆️

@@ -74,6 +76,47 @@ func (rg *Range) Less(than btree.Item) bool {
return bytes.Compare(rg.StartKey, ta.StartKey) < 0
}

// NeedsMerge checks whether two ranges needs to be merged.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

directly move from br/pkg/restore/merge.go

Copy link
Contributor

@3pointer 3pointer left a comment

Choose a reason for hiding this comment

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

rest LGTM

br/pkg/rtree/rtree_test.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 1, 2024
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
Copy link
Contributor

@YuJuncen YuJuncen left a comment

Choose a reason for hiding this comment

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

rest lgtm

br/pkg/rtree/rtree.go Outdated Show resolved Hide resolved
br/pkg/rtree/rtree.go Outdated Show resolved Hide resolved
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
Copy link

ti-chi-bot bot commented Feb 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3pointer, YuJuncen

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:

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 added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 2, 2024
Copy link

ti-chi-bot bot commented Feb 2, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-01 06:05:17.493430662 +0000 UTC m=+1631959.057728357: ☑️ agreed by 3pointer.
  • 2024-02-02 10:13:47.980124913 +0000 UTC m=+1733269.544422617: ☑️ agreed by YuJuncen.

@ti-chi-bot ti-chi-bot bot merged commit 7cdab19 into pingcap:master Feb 2, 2024
27 checks passed
@BornChanger
Copy link
Contributor

/type cherry-pick-for-release-7.5

@ti-chi-bot ti-chi-bot bot added the type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. label Feb 2, 2024
@BornChanger
Copy link
Contributor

/type cherry-pick-for-release-6.5

@ti-chi-bot ti-chi-bot bot added the type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. label Feb 2, 2024
@BornChanger
Copy link
Contributor

/type cherry-pick-for-release-7.1

@ti-chi-bot ti-chi-bot bot added the type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. label Feb 2, 2024
@Leavrth Leavrth removed the type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. label Feb 4, 2024
@Leavrth Leavrth added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. and removed type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Feb 4, 2024
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 4, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 4, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 4, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

br restore very slow (like it hangs) when merging files
5 participants