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

sql: move the existing savepoint logic to a separate file #44684

Merged
merged 1 commit into from
Feb 5, 2020

Conversation

knz
Copy link
Contributor

@knz knz commented Feb 4, 2020

This commit re-organizes the code without any functional change.

(Split from #43051 for ease of review.)

@knz knz requested a review from andreimatei February 4, 2020 13:20
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 4 of 4 files at r1.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andreimatei and @knz)


pkg/sql/conn_executor_exec.go, line 568 at r1 (raw file):

// commitSQLTransaction executes a commit after the execution of a stmt,
// which can be any statement when executing a statement with an implicit
// transaction, or a COMMIT statement when using

[nit]: could combine these two short lines.


pkg/sql/conn_executor_savepoints.go, line 79 at r1 (raw file):

// execRollbackToSavepointInOpenState runs a ROLLBACK TO SAVEPOINT
// statmeent inside an open txn.

s/statmeent/statement/g.

This commit re-organizes the code without any functional change.

Release note: None
@knz knz force-pushed the 20200204-sql-savepoint-separate branch from 6902fe1 to afc823e Compare February 5, 2020 16:49
Copy link
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

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

TFYR!

bors r=yuzefovich

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andreimatei and @yuzefovich)


pkg/sql/conn_executor_exec.go, line 568 at r1 (raw file):

Previously, yuzefovich wrote…

[nit]: could combine these two short lines.

Done.


pkg/sql/conn_executor_savepoints.go, line 79 at r1 (raw file):

Previously, yuzefovich wrote…

s/statmeent/statement/g.

Done.

craig bot pushed a commit that referenced this pull request Feb 5, 2020
43828: backupccl: add full cluster restore r=pbardea a=pbardea

This commit adds the ability to entirely restore a full cluster backup.
This includes replacing the contents of some system tables to match the
data in the backup. Full cluster restore can be used using the `RESTORE
FROM ...` syntax and is expected to be run on a new cluster with no user
data.

Release note (enterprise change): Add full cluster restore feature which
restores all the information contained in a full cluster backup. This
includes all of the user data as well as relevant data from system
tables. It is expected to be run on a new cluster with no user data.

44684: sql: move the existing savepoint logic to a separate file r=yuzefovich a=knz

This commit re-organizes the code without any functional change.

(Split from #43051 for ease of review.)

Co-authored-by: Paul Bardea <pbardea@gmail.com>
Co-authored-by: Raphael 'kena' Poss <knz@thaumogen.net>
@craig
Copy link
Contributor

craig bot commented Feb 5, 2020

Build succeeded

@craig craig bot merged commit afc823e into cockroachdb:master Feb 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants