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

external: make global sort common.Range unencoded #51900

Merged
merged 12 commits into from
Mar 20, 2024

Conversation

tangenta
Copy link
Contributor

@tangenta tangenta commented Mar 19, 2024

What problem does this PR solve?

Issue Number: close #51910

Problem Summary:

Previously, start key / end key of common.Range is NOT encoded for local engine, but encoded for external engine. This will cause external engine generates a wrong range, and no data will be ingest to TiKV:

start, end := keyRange.Start, keyRange.End
pairStart, pairEnd, err := data.GetFirstAndLastKey(start, end)
if err != nil {
return nil, err
}

func (m *MemoryIngestData) GetFirstAndLastKey(lowerBound, upperBound []byte) ([]byte, []byte, error) {
firstKeyIdx, lastKeyIdx := m.firstAndLastKeyIndex(lowerBound, upperBound)
if firstKeyIdx < 0 || firstKeyIdx > lastKeyIdx {
return nil, nil, nil
}
firstKey, err := m.keyAdapter.Decode(nil, m.keys[firstKeyIdx])
if err != nil {
return nil, nil, err
}
lastKey, err := m.keyAdapter.Decode(nil, m.keys[lastKeyIdx])
if err != nil {
return nil, nil, err
}
return firstKey, lastKey, nil
}

If keyRange.Start is encoded, m.firstAndLastKeyIndex will encode it again. Thus, these keys are encoded twice.

What changed and how does it work?

After this PR, we will follow the conventions as below:

For both local and external engines,

  • the data on s3 is encoded
  • the statistical data on s3 is encoded
  • all common.Range are not encoded.

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

Copy link

tiprow bot commented Mar 19, 2024

Hi @tangenta. 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 Mar 19, 2024

Codecov Report

Merging #51900 (70c2eb8) into master (af89779) will decrease coverage by 15.9559%.
Report is 21 commits behind head on master.
The diff coverage is 43.4782%.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #51900         +/-   ##
=================================================
- Coverage   70.7641%   54.8082%   -15.9559%     
=================================================
  Files          1477       1588        +111     
  Lines        438517     611829     +173312     
=================================================
+ Hits         310313     335333      +25020     
- Misses       108797     253294     +144497     
- Partials      19407      23202       +3795     
Flag Coverage Δ
integration 36.7566% <30.4347%> (?)
unit 70.4636% <28.2608%> (-0.1028%) ⬇️

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

Components Coverage Δ
dumpling 53.9957% <ø> (ø)
parser ∅ <ø> (∅)
br 51.3246% <40.9090%> (+5.4914%) ⬆️

@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 19, 2024
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 19, 2024
@tangenta tangenta changed the title try to fix uk data inconsistency for global sort external: make global sort common.Range unencoded Mar 19, 2024
@tangenta tangenta changed the title external: make global sort common.Range unencoded external: make global sort common.Range unencoded Mar 19, 2024
br/pkg/lightning/backend/external/engine.go Outdated Show resolved Hide resolved
br/pkg/lightning/backend/external/engine.go Outdated Show resolved Hide resolved
br/pkg/lightning/backend/external/engine.go Outdated Show resolved Hide resolved
br/pkg/lightning/backend/external/engine.go Outdated Show resolved Hide resolved
br/pkg/lightning/backend/external/util.go Show resolved Hide resolved
Signed-off-by: lance6716 <lance6716@gmail.com>
@lance6716
Copy link
Contributor

/ok-to-test

@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 20, 2024
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
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

Copy link

ti-chi-bot bot commented Mar 20, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-20 09:26:22.872936143 +0000 UTC m=+1455209.895182531: ☑️ agreed by lance6716.
  • 2024-03-20 10:04:31.72986657 +0000 UTC m=+1457498.752112952: ☑️ agreed by Benjamin2037.

Copy link

ti-chi-bot bot commented Mar 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, lance6716, 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 the approved label Mar 20, 2024
@tangenta
Copy link
Contributor Author

/retest

1 similar comment
@lance6716
Copy link
Contributor

/retest

@ti-chi-bot ti-chi-bot bot merged commit 735adb0 into pingcap:master Mar 20, 2024
34 checks passed
@ti-chi-bot
Copy link
Member

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

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-8.0 ok-to-test release-note-none 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.

Adding unique index with global sort gets stuck
5 participants