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
Add no lock parameter for Postgres #1030
Open
Ray-Barker
wants to merge
2
commits into
golang-migrate:master
Choose a base branch
from
Ray-Barker:ray-barker/add-no-lock-postgres
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,6 +53,7 @@ type Config struct { | |
migrationsTableName string | ||
StatementTimeout time.Duration | ||
MultiStatementMaxSize int | ||
NoLock bool | ||
} | ||
|
||
type Postgres struct { | ||
|
@@ -202,13 +203,22 @@ func (p *Postgres) Open(url string) (database.Driver, error) { | |
} | ||
} | ||
|
||
noLock := false | ||
if s := purl.Query().Get("x-no-lock"); len(s) > 0 { | ||
noLock, err = strconv.ParseBool(s) | ||
if err != nil { | ||
return nil, fmt.Errorf("Unable to parse option no-lock: %w", err) | ||
} | ||
} | ||
|
||
px, err := WithInstance(db, &Config{ | ||
DatabaseName: purl.Path, | ||
MigrationsTable: migrationsTable, | ||
MigrationsTableQuoted: migrationsTableQuoted, | ||
StatementTimeout: time.Duration(statementTimeout) * time.Millisecond, | ||
MultiStatementEnabled: multiStatementEnabled, | ||
MultiStatementMaxSize: multiStatementMaxSize, | ||
NoLock: noLock, | ||
}) | ||
|
||
if err != nil { | ||
|
@@ -234,6 +244,9 @@ func (p *Postgres) Close() error { | |
// https://www.postgresql.org/docs/9.6/static/explicit-locking.html#ADVISORY-LOCKS | ||
func (p *Postgres) Lock() error { | ||
return database.CasRestoreOnErr(&p.isLocked, false, true, database.ErrLocked, func() error { | ||
if p.config.NoLock { | ||
return nil | ||
} | ||
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName) | ||
if err != nil { | ||
return err | ||
|
@@ -251,6 +264,9 @@ func (p *Postgres) Lock() error { | |
|
||
func (p *Postgres) Unlock() error { | ||
return database.CasRestoreOnErr(&p.isLocked, true, false, database.ErrNotLocked, func() error { | ||
if p.config.NoLock { | ||
return nil | ||
} | ||
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName) | ||
if err != nil { | ||
return err | ||
|
@@ -453,6 +469,7 @@ func (p *Postgres) Drop() (err error) { | |
// Note that this function locks the database, which deviates from the usual | ||
// convention of "caller locks" in the Postgres type. | ||
func (p *Postgres) ensureVersionTable() (err error) { | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: remove this unnecessary change |
||
if err = p.Lock(); err != nil { | ||
return err | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Document this new parameter in the README