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

executor: Fix crash during sort spill (#47581) #47624

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #47581

What problem does this PR solve?

Issue Number: close #47538

Problem Summary:

What is changed and how it works?

  • Add base struct baseSpillDiskAction for SpillDiskAction and SortAndSpillDiskAction, so SortAndSpillDiskAction don't have to hold a useless RowContainer
  • Add a new interface SpillHelper and use a common function (a *baseSpillDiskAction) action(t *memory.Tracker, spillHelper SpillHelper) to unify the code of (a *SpillDiskAction) Action(t *memory.Tracker) and (a *SortAndSpillDiskAction) Action(t *memory.Tracker)
  • Add recover function in c *SortedRowContainer) Sort() to avoid panic

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

@ti-chi-bot ti-chi-bot added 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Oct 13, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 16, 2023
@windtalker
Copy link
Contributor

/test unit-test

@tiprow
Copy link

tiprow bot commented Oct 16, 2023

@windtalker: No presubmit jobs available for pingcap/tidb@release-6.5

In response to this:

/test unit-test

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.

@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@6bf0542). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #47624   +/-   ##
================================================
  Coverage               ?   73.6793%           
================================================
  Files                  ?       1085           
  Lines                  ?     348399           
  Branches               ?          0           
================================================
  Hits                   ?     256698           
  Misses                 ?      75233           
  Partials               ?      16468           

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Oct 17, 2023
Copy link
Contributor

@windtalker windtalker 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 bot added the lgtm label Oct 17, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: windtalker, zanmato1984

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:
  • OWNERS [windtalker,zanmato1984]

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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Oct 17, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 17, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-17 09:11:47.936651444 +0000 UTC m=+1734705.523761583: ☑️ agreed by zanmato1984.
  • 2023-10-17 09:17:02.883192343 +0000 UTC m=+1735020.470302488: ☑️ agreed by windtalker.

@ti-chi-bot ti-chi-bot bot merged commit ecdeae0 into pingcap:release-6.5 Oct 17, 2023
3 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 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants