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.

Sign up for GitHub

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

Jump to bottom

update BACKUP/RESTORE syntax; Added IMPORT statement(#824) #860

Merged
merged 2 commits into from
May 21, 2020
Merged

update BACKUP/RESTORE syntax; Added IMPORT statement(#824) #860

merged 2 commits into from
May 21, 2020

Conversation

XuHuaiyu
Copy link
Contributor

cherry-pick #824

What problem does this PR solve?

Update the parser syntax to match pingcap/tidb#15274.

What is changed and how it works?

  1. Removed the S3/GCS-specific options
  2. Removed the "INCREMENTAL UNTIL" syntax, replaced by the "LAST_BACKUP" option
  3. The "SHOW BACKUP" statement is renamed to "SHOW BACKUPS".
  4. Added "IMPORT" statement (fix Design syntax for using Lightning from SQL tidb-lightning#293)

(Recommended: ignore whitespace when reviewing).

Check List

Tests

  • Unit test

Code changes

  • Has exported variable/fields change

Side effects

Related changes

@kennytm @XuHuaiyu
Update BACKUP/RESTORE syntax to match the RFC; Added IMPORT statement (…
dfa374c 
…pingcap#824)

* *: remove the s3/gcs-specific options

* *: replace the INCREMENTAL UNTIL syntax with LAST_BACKUP = ...

* *: use SHOW BACKUPS rather than SHOW BACKUP

* *: added IMPORT statements and options
@XuHuaiyu XuHuaiyu requested a review from a team May 21, 2020 03:55
@ghost ghost requested review from tangenta and removed request for a team May 21, 2020 03:55
@XuHuaiyu XuHuaiyu requested a review from kennytm May 21, 2020 03:56
@codecov
Copy link

codecov bot commented May 21, 2020 •
edited
Loading

Codecov Report

Merging #860 into release-4.0 will increase coverage by 0.08%.
The diff coverage is 100.00%.

@@               Coverage Diff               @@
##           release-4.0     #860      +/-   ##
===============================================
+ Coverage        78.24%   78.32%   +0.08%     
===============================================
  Files               40       40              
  Lines            14720    14752      +32     
===============================================
+ Hits             11517    11555      +38     
+ Misses            2521     2516       -5     
+ Partials           682      681       -1

kennytm
kennytm reviewed May 21, 2020
View reviewed changes
Copy link
Contributor

@kennytm kennytm left a comment

Choose a reason for hiding this comment

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

Lgtm

@tiancaiamao
Copy link
Collaborator

LGTM

@XuHuaiyu XuHuaiyu changed the title Update BACKUP/RESTORE syntax to match the RFC; Added IMPORT statement(#824) update BACKUP/RESTORE syntax; Added IMPORT statement(#824) May 21, 2020
@XuHuaiyu XuHuaiyu merged commit 3e62967 into pingcap:release-4.0 May 21, 2020
@XuHuaiyu XuHuaiyu deleted the release-4.0 branch May 21, 2020 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

@tiancaiamao tiancaiamao tiancaiamao approved these changes

@tangenta tangenta Awaiting requested review from tangenta

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@XuHuaiyu @tiancaiamao @kennytm