Skip to content

Commit 6ea7216

Browse files
HaraldNordgrenHaraldNordgren
committed
revert GenerateAdvisoryLockID
1 parent 952d08e commit 6ea7216

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎database/cockroachdb/cockroachdb.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func (c *CockroachDb) Close() error {
149149
func (c *CockroachDb) Lock() error {
150150
return database.CasRestoreOnErr(&c.isLocked, false, true, database.ErrLocked, func() (err error) {
151151
return crdb.ExecuteTx(context.Background(), c.db, nil, func(tx *sql.Tx) (err error) {
152-
aid, err := database.GenerateAdvisoryLockID(c.config.DatabaseName)
152+
aid, err := database.GenerateAdvisoryLockId(c.config.DatabaseName)
153153
if err != nil {
154154
return err
155155
}
@@ -185,7 +185,7 @@ func (c *CockroachDb) Lock() error {
185185
// See: https://github.com/cockroachdb/cockroach/issues/13546
186186
func (c *CockroachDb) Unlock() error {
187187
return database.CasRestoreOnErr(&c.isLocked, true, false, database.ErrNotLocked, func() (err error) {
188-
aid, err := database.GenerateAdvisoryLockID(c.config.DatabaseName)
188+
aid, err := database.GenerateAdvisoryLockId(c.config.DatabaseName)
189189
if err != nil {
190190
return err
191191
}

‎database/mysql/mysql.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func (m *Mysql) Lock() error {
287287
if m.config.NoLock {
288288
return nil
289289
}
290-
aid, err := database.GenerateAdvisoryLockID(
290+
aid, err := database.GenerateAdvisoryLockId(
291291
fmt.Sprintf("%s:%s", m.config.DatabaseName, m.config.MigrationsTable))
292292
if err != nil {
293293
return err
@@ -313,7 +313,7 @@ func (m *Mysql) Unlock() error {
313313
return nil
314314
}
315315

316-
aid, err := database.GenerateAdvisoryLockID(
316+
aid, err := database.GenerateAdvisoryLockId(
317317
fmt.Sprintf("%s:%s", m.config.DatabaseName, m.config.MigrationsTable))
318318
if err != nil {
319319
return err

‎database/pgx/pgx.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func (p *Postgres) Unlock() error {
274274

275275
// https://www.postgresql.org/docs/9.6/static/explicit-locking.html#ADVISORY-LOCKS
276276
func (p *Postgres) applyAdvisoryLock() error {
277-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
277+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
278278
if err != nil {
279279
return err
280280
}
@@ -299,7 +299,7 @@ func (p *Postgres) applyTableLock() error {
299299
}
300300
}()
301301

302-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName)
302+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName)
303303
if err != nil {
304304
return err
305305
}
@@ -331,7 +331,7 @@ func (p *Postgres) applyTableLock() error {
331331
}
332332

333333
func (p *Postgres) releaseAdvisoryLock() error {
334-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
334+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
335335
if err != nil {
336336
return err
337337
}
@@ -345,7 +345,7 @@ func (p *Postgres) releaseAdvisoryLock() error {
345345
}
346346

347347
func (p *Postgres) releaseTableLock() error {
348-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName)
348+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName)
349349
if err != nil {
350350
return err
351351
}

‎database/pgx/v5/pgx.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (p *Postgres) Close() error {
220220
// https://www.postgresql.org/docs/9.6/static/explicit-locking.html#ADVISORY-LOCKS
221221
func (p *Postgres) Lock() error {
222222
return database.CasRestoreOnErr(&p.isLocked, false, true, database.ErrLocked, func() error {
223-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
223+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
224224
if err != nil {
225225
return err
226226
}
@@ -236,7 +236,7 @@ func (p *Postgres) Lock() error {
236236

237237
func (p *Postgres) Unlock() error {
238238
return database.CasRestoreOnErr(&p.isLocked, true, false, database.ErrNotLocked, func() error {
239-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
239+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
240240
if err != nil {
241241
return err
242242
}

‎database/postgres/postgres.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func (p *Postgres) Close() error {
232232
// https://www.postgresql.org/docs/9.6/static/explicit-locking.html#ADVISORY-LOCKS
233233
func (p *Postgres) Lock() error {
234234
return database.CasRestoreOnErr(&p.isLocked, false, true, database.ErrLocked, func() error {
235-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
235+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
236236
if err != nil {
237237
return err
238238
}
@@ -249,7 +249,7 @@ func (p *Postgres) Lock() error {
249249

250250
func (p *Postgres) Unlock() error {
251251
return database.CasRestoreOnErr(&p.isLocked, true, false, database.ErrNotLocked, func() error {
252-
aid, err := database.GenerateAdvisoryLockID(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
252+
aid, err := database.GenerateAdvisoryLockId(p.config.DatabaseName, p.config.migrationsSchemaName, p.config.migrationsTableName)
253253
if err != nil {
254254
return err
255255
}

‎database/sqlserver/sqlserver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func (ss *SQLServer) Close() error {
192192
// Lock creates an advisory local on the database to prevent multiple migrations from running at the same time.
193193
func (ss *SQLServer) Lock() error {
194194
return database.CasRestoreOnErr(&ss.isLocked, false, true, database.ErrLocked, func() error {
195-
aid, err := database.GenerateAdvisoryLockID(ss.config.DatabaseName, ss.config.SchemaName)
195+
aid, err := database.GenerateAdvisoryLockId(ss.config.DatabaseName, ss.config.SchemaName)
196196
if err != nil {
197197
return err
198198
}
@@ -222,7 +222,7 @@ func (ss *SQLServer) Lock() error {
222222
// Unlock froms the migration lock from the database
223223
func (ss *SQLServer) Unlock() error {
224224
return database.CasRestoreOnErr(&ss.isLocked, true, false, database.ErrNotLocked, func() error {
225-
aid, err := database.GenerateAdvisoryLockID(ss.config.DatabaseName, ss.config.SchemaName)
225+
aid, err := database.GenerateAdvisoryLockId(ss.config.DatabaseName, ss.config.SchemaName)
226226
if err != nil {
227227
return err
228228
}

‎database/util.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
const advisoryLockIDSalt uint = 1486364155
1111

12-
// GenerateAdvisoryLockID inspired by rails migrations, see https://goo.gl/8o9bCT
13-
func GenerateAdvisoryLockID(databaseName string, additionalNames ...string) (string, error) {
12+
// GenerateAdvisoryLockId inspired by rails migrations, see https://goo.gl/8o9bCT
13+
func GenerateAdvisoryLockId(databaseName string, additionalNames ...string) (string, error) { // nolint: golint
1414
if len(additionalNames) > 0 {
1515
databaseName = strings.Join(append(additionalNames, databaseName), "\x00")
1616
}

‎database/util_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77
)
88

9-
func TestGenerateAdvisoryLockID(t *testing.T) {
9+
func TestGenerateAdvisoryLockId(t *testing.T) {
1010
testcases := []struct {
1111
dbname string
1212
additional []string
@@ -35,7 +35,7 @@ func TestGenerateAdvisoryLockID(t *testing.T) {
3535

3636
for _, tc := range testcases {
3737
t.Run(tc.dbname, func(t *testing.T) {
38-
if id, err := GenerateAdvisoryLockID(tc.dbname, tc.additional...); err == nil {
38+
if id, err := GenerateAdvisoryLockId(tc.dbname, tc.additional...); err == nil {
3939
if id != tc.expectedID {
4040
t.Error("Generated incorrect ID:", id, "!=", tc.expectedID)
4141
}

‎database/yugabytedb/yugabytedb.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func (c *YugabyteDB) Close() error {
194194
func (c *YugabyteDB) Lock() error {
195195
return database.CasRestoreOnErr(&c.isLocked, false, true, database.ErrLocked, func() (err error) {
196196
return c.doTxWithRetry(context.Background(), &sql.TxOptions{Isolation: sql.LevelSerializable}, func(tx *sql.Tx) (err error) {
197-
aid, err := database.GenerateAdvisoryLockID(c.config.DatabaseName)
197+
aid, err := database.GenerateAdvisoryLockId(c.config.DatabaseName)
198198
if err != nil {
199199
return err
200200
}
@@ -230,7 +230,7 @@ func (c *YugabyteDB) Lock() error {
230230
// See: https://github.com/yugabyte/yugabyte-db/issues/3642
231231
func (c *YugabyteDB) Unlock() error {
232232
return database.CasRestoreOnErr(&c.isLocked, true, false, database.ErrNotLocked, func() (err error) {
233-
aid, err := database.GenerateAdvisoryLockID(c.config.DatabaseName)
233+
aid, err := database.GenerateAdvisoryLockId(c.config.DatabaseName)
234234
if err != nil {
235235
return err
236236
}

0 commit comments

Comments
 (0)