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, planner: fix plan_replayer zip format (#47474) #47714

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #47474

What problem does this PR solve?

Issue Number: close #46474

Problem Summary:

If the zip file dumped by plan replayer dump is unzipped and zipped again, a normal compression software will always add entries for directories, such as stats/... They are just directories and cannot be read, so we should skip them to avoid returning error.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test

    The basic function of plan replayer has been covered by existing tests. It's hard to add tests for this PR as it needs cooperation with other compression software. I've considered to add an existing zip file as test data, but we cannot promise that a dumped file can be decoded by any version of TiDB right? so it'll need to be updated in the future 🤔 .

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fix the issue that if the zip file dumped by `plan replayer` is decompressed and compressed again, it cannot be loaded into TiDB.

Signed-off-by: Yang Keao <yangkeao@chunibyo.icu>
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Oct 17, 2023
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Oct 17, 2023
@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: chrysan, time-and-fate

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 [chrysan,time-and-fate]

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 07:57:28.109022588 +0000 UTC m=+1730245.696132732: ☑️ agreed by chrysan.
  • 2023-10-17 08:03:39.36934427 +0000 UTC m=+1730616.956454414: ☑️ agreed by time-and-fate.

@codecov
Copy link

codecov bot commented Oct 17, 2023

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #47714   +/-   ##
================================================
  Coverage               ?   73.6818%           
================================================
  Files                  ?       1085           
  Lines                  ?     348402           
  Branches               ?          0           
================================================
  Hits                   ?     256709           
  Misses                 ?      75224           
  Partials               ?      16469           

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 17, 2023
@chrysan
Copy link
Contributor

chrysan commented Oct 17, 2023

/retest

@ti-chi-bot ti-chi-bot bot merged commit 9015774 into pingcap:release-6.5 Oct 17, 2023
10 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 Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. 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.

4 participants