Skip to content

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #60638

What problem does this PR solve?

Issue Number: close #60593

Problem Summary:

Previous sorting impl is problematic.

What changed and how does it work?

The original code mistakenly swapped the elements of tableSlice manually during sorting, causing it to be out of sync with schemaSlice. By merging the data and sorting them uniformly, the order consistency of the two is ensured, eliminating the data misalignment problem caused by manual swapping.

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: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Apr 18, 2025
@ti-chi-bot
Copy link
Member Author

@tangenta This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@joccau
Copy link
Contributor

joccau commented Apr 18, 2025

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 18, 2025
@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Apr 18, 2025
@codecov
Copy link

codecov bot commented Apr 18, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-8.5@7f8010b). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #60643   +/-   ##
================================================
  Coverage               ?   56.9878%           
================================================
  Files                  ?       1770           
  Lines                  ?     628757           
  Branches               ?          0           
================================================
  Hits                   ?     358315           
  Misses                 ?     246283           
  Partials               ?      24159           
Flag Coverage Δ
integration 36.8449% <100.0000%> (?)
unit 72.6649% <100.0000%> (?)

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

Components Coverage Δ
dumpling 52.8711% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 52.3657% <0.0000%> (?)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 18, 2025
@ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 18, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-04-18 02:11:29.868652748 +0000 UTC m=+2999983.552888844: ☑️ agreed by joccau.
  • 2025-04-18 02:44:02.884185524 +0000 UTC m=+3001936.568421620: ☑️ agreed by tangenta.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hawkingrei, joccau, tangenta

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 approved cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 18, 2025
@ti-chi-bot ti-chi-bot bot merged commit ba894d6 into pingcap:release-8.5 Apr 18, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants