Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

restore: Fix system tables are filtered bug #1207

Merged
merged 19 commits into from
Jun 15, 2021

Conversation

ZipFast
Copy link
Contributor

@ZipFast ZipFast commented Jun 11, 2021

What problem does this PR solve?

Fix issue #1197 and #1201
When user only want to restore the system table, i.e. -f "mysql*.*", because the system database was rename to a temporary name, that name will be filtered causing no system table is restored

What is changed and how it works?

When filter restore databases and tables, revert the temporary name to its original name

Check List

Tests

  • Integration test

Code changes

  • Has exported function/method change

Related changes

  • Need to cherry-pick to the release branch

Release note

  • No Release Note

@ZipFast ZipFast marked this pull request as ready for review June 11, 2021 08:20
@ZipFast ZipFast requested review from YuJuncen and kennytm June 11, 2021 08:20
@ti-chi-bot ti-chi-bot added size/M and removed size/S labels Jun 11, 2021
@ZipFast
Copy link
Contributor Author

ZipFast commented Jun 11, 2021

/run-integration-tests

2 similar comments
@ZipFast
Copy link
Contributor Author

ZipFast commented Jun 11, 2021

/run-integration-tests

@ZipFast
Copy link
Contributor Author

ZipFast commented Jun 11, 2021

/run-integration-tests

@ZipFast
Copy link
Contributor Author

ZipFast commented Jun 15, 2021

/run-integration-test

func GetSysDBName(tempDB model.CIStr) (string, bool) {
ok := strings.Contains(tempDB.O, "__TiDB_BR_Temporary_")
i := strings.LastIndex(tempDB.O, "_")
return tempDB.O[i+1:], ok
Copy link
Collaborator

Choose a reason for hiding this comment

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

it should be checking if ok := strings.HasPrefix(tempDB.O, "__TiDB_BR_Temporary_"), right? And the i+1 is the length of that temporary string.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed this method

@ti-chi-bot ti-chi-bot added the status/LGT1 LGTM1 label Jun 15, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • kennytm

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 LGTM2 and removed status/LGT1 LGTM1 labels Jun 15, 2021
@3pointer
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 33f6b11

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #1216.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #1224.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #1225.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants