Merge pull request #1303 from romshark/master

romshark · web-flow · commit 8945e853c4c8 · 2025-08-20T16:35:25.000-07:00
refactor: Remove go.uber.org/atomic in favor of std sync/atomic
diff --git a/database/cassandra/cassandra.go b/database/cassandra/cassandra.go
@@ -7,10 +7,9 @@ import (
 	nurl "net/url"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
-	"go.uber.org/atomic"
-
 	"github.com/gocql/gocql"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/golang-migrate/migrate/v4/database/multistmt"
@@ -199,14 +198,14 @@ func (c *Cassandra) Close() error {
 }
 
 func (c *Cassandra) Lock() error {
-	if !c.isLocked.CAS(false, true) {
+	if !c.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 
 func (c *Cassandra) Unlock() error {
-	if !c.isLocked.CAS(true, false) {
+	if !c.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/clickhouse/clickhouse.go b/database/clickhouse/clickhouse.go
@@ -7,10 +7,9 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
-	"go.uber.org/atomic"
-
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/golang-migrate/migrate/v4/database/multistmt"
@@ -291,14 +290,14 @@ func (ch *ClickHouse) Drop() (err error) {
 }
 
 func (ch *ClickHouse) Lock() error {
-	if !ch.isLocked.CAS(false, true) {
+	if !ch.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 
 	return nil
 }
 func (ch *ClickHouse) Unlock() error {
-	if !ch.isLocked.CAS(true, false) {
+	if !ch.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 
diff --git a/database/cockroachdb/cockroachdb.go b/database/cockroachdb/cockroachdb.go
@@ -8,13 +8,13 @@ import (
 	nurl "net/url"
 	"regexp"
 	"strconv"
+	"sync/atomic"
 
 	"github.com/cockroachdb/cockroach-go/v2/crdb"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/hashicorp/go-multierror"
 	"github.com/lib/pq"
-	"go.uber.org/atomic"
 )
 
 func init() {
diff --git a/database/firebird/firebird.go b/database/firebird/firebird.go
@@ -8,12 +8,12 @@ import (
 	"fmt"
 	"io"
 	nurl "net/url"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/hashicorp/go-multierror"
 	_ "github.com/nakagami/firebirdsql"
-	"go.uber.org/atomic"
 )
 
 func init() {
@@ -107,14 +107,14 @@ func (f *Firebird) Close() error {
 }
 
 func (f *Firebird) Lock() error {
-	if !f.isLocked.CAS(false, true) {
+	if !f.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 
 func (f *Firebird) Unlock() error {
-	if !f.isLocked.CAS(true, false) {
+	if !f.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/mongodb/mongodb.go b/database/mongodb/mongodb.go
@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"os"
 	"strconv"
+	"sync/atomic"
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
@@ -16,7 +17,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/x/mongo/driver/connstring"
-	"go.uber.org/atomic"
 )
 
 func init() {
diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -13,10 +13,9 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
-	"go.uber.org/atomic"
-
 	"github.com/go-sql-driver/mysql"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/hashicorp/go-multierror"
diff --git a/database/pgx/pgx.go b/database/pgx/pgx.go
@@ -11,10 +11,9 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
-	"go.uber.org/atomic"
-
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/golang-migrate/migrate/v4/database/multistmt"
diff --git a/database/pgx/v5/pgx.go b/database/pgx/v5/pgx.go
@@ -11,10 +11,9 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
-	"go.uber.org/atomic"
-
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/golang-migrate/migrate/v4/database/multistmt"
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -11,10 +11,9 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
-	"go.uber.org/atomic"
-
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/golang-migrate/migrate/v4/database/multistmt"
diff --git a/database/ql/ql.go b/database/ql/ql.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	nurl "net/url"
 	"strings"
+	"sync/atomic"
 
 	"github.com/hashicorp/go-multierror"
-	"go.uber.org/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -166,13 +166,13 @@ func (m *Ql) Drop() (err error) {
 	return nil
 }
 func (m *Ql) Lock() error {
-	if !m.isLocked.CAS(false, true) {
+	if !m.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 func (m *Ql) Unlock() error {
-	if !m.isLocked.CAS(true, false) {
+	if !m.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
@@ -10,8 +10,7 @@ import (
 	nurl "net/url"
 	"strconv"
 	"strings"
-
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -127,14 +126,14 @@ func (p *Redshift) Close() error {
 
 // Redshift does not support advisory lock functions: https://docs.aws.amazon.com/redshift/latest/dg/c_unsupported-postgresql-functions.html
 func (p *Redshift) Lock() error {
-	if !p.isLocked.CAS(false, true) {
+	if !p.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 
 func (p *Redshift) Unlock() error {
-	if !p.isLocked.CAS(true, false) {
+	if !p.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/rqlite/rqlite.go b/database/rqlite/rqlite.go
@@ -6,8 +6,7 @@ import (
 	nurl "net/url"
 	"strconv"
 	"strings"
-
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -143,7 +142,7 @@ func (r *Rqlite) Close() error {
 // If the implementation can't provide this functionality, return nil.
 // Return database.ErrLocked if database is already locked.
 func (r *Rqlite) Lock() error {
-	if !r.isLocked.CAS(false, true) {
+	if !r.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
@@ -152,7 +151,7 @@ func (r *Rqlite) Lock() error {
 // Unlock should release the lock. Migrate will call this function after
 // all migrations have been run.
 func (r *Rqlite) Unlock() error {
-	if !r.isLocked.CAS(true, false) {
+	if !r.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/snowflake/snowflake.go b/database/snowflake/snowflake.go
@@ -8,8 +8,7 @@ import (
 	nurl "net/url"
 	"strconv"
 	"strings"
-
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/hashicorp/go-multierror"
@@ -159,14 +158,14 @@ func (p *Snowflake) Close() error {
 }
 
 func (p *Snowflake) Lock() error {
-	if !p.isLocked.CAS(false, true) {
+	if !p.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 
 func (p *Snowflake) Unlock() error {
-	if !p.isLocked.CAS(true, false) {
+	if !p.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/spanner/spanner.go b/database/spanner/spanner.go
@@ -10,6 +10,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync/atomic"
 
 	"cloud.google.com/go/spanner"
 	sdb "cloud.google.com/go/spanner/admin/database/apiv1"
@@ -20,7 +21,6 @@ import (
 
 	adminpb "cloud.google.com/go/spanner/admin/database/apiv1/databasepb"
 	"github.com/hashicorp/go-multierror"
-	uatomic "go.uber.org/atomic"
 	"google.golang.org/api/iterator"
 )
 
@@ -32,11 +32,6 @@ func init() {
 // DefaultMigrationsTable is used if no custom table is specified
 const DefaultMigrationsTable = "SchemaMigrations"
 
-const (
-	unlockedVal = 0
-	lockedVal   = 1
-)
-
 // Driver errors
 var (
 	ErrNilConfig      = errors.New("no config")
@@ -64,7 +59,7 @@ type Spanner struct {
 
 	config *Config
 
-	lock *uatomic.Uint32
+	lock atomic.Bool
 }
 
 type DB struct {
@@ -96,7 +91,6 @@ func WithInstance(instance *DB, config *Config) (database.Driver, error) {
 	sx := &Spanner{
 		db:     instance,
 		config: config,
-		lock:   uatomic.NewUint32(unlockedVal),
 	}
 
 	if err := sx.ensureVersionTable(); err != nil {
@@ -153,15 +147,15 @@ func (s *Spanner) Close() error {
 // Lock implements database.Driver but doesn't do anything because Spanner only
 // enqueues the UpdateDatabaseDdlRequest.
 func (s *Spanner) Lock() error {
-	if swapped := s.lock.CAS(unlockedVal, lockedVal); swapped {
+	if swapped := s.lock.CompareAndSwap(false, true); swapped {
 		return nil
 	}
 	return ErrLockHeld
 }
 
 // Unlock implements database.Driver but no action required, see Lock.
 func (s *Spanner) Unlock() error {
-	if swapped := s.lock.CAS(lockedVal, unlockedVal); swapped {
+	if swapped := s.lock.CompareAndSwap(true, false); swapped {
 		return nil
 	}
 	return ErrLockNotHeld
diff --git a/database/sqlcipher/sqlcipher.go b/database/sqlcipher/sqlcipher.go
@@ -7,8 +7,7 @@ import (
 	nurl "net/url"
 	"strconv"
 	"strings"
-
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -178,14 +177,14 @@ func (m *Sqlite) Drop() (err error) {
 }
 
 func (m *Sqlite) Lock() error {
-	if !m.isLocked.CAS(false, true) {
+	if !m.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 
 func (m *Sqlite) Unlock() error {
-	if !m.isLocked.CAS(true, false) {
+	if !m.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/sqlite/sqlite.go b/database/sqlite/sqlite.go
@@ -7,8 +7,7 @@ import (
 	nurl "net/url"
 	"strconv"
 	"strings"
-
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -178,14 +177,14 @@ func (m *Sqlite) Drop() (err error) {
 }
 
 func (m *Sqlite) Lock() error {
-	if !m.isLocked.CAS(false, true) {
+	if !m.isLocked.CompareAndSwap(false, true) {
 		return database.ErrLocked
 	}
 	return nil
 }
 
 func (m *Sqlite) Unlock() error {
-	if !m.isLocked.CAS(true, false) {
+	if !m.isLocked.CompareAndSwap(true, false) {
 		return database.ErrNotLocked
 	}
 	return nil
diff --git a/database/sqlite3/sqlite3.go b/database/sqlite3/sqlite3.go
diff --git a/database/sqlserver/sqlserver.go b/database/sqlserver/sqlserver.go
diff --git a/database/stub/stub.go b/database/stub/stub.go
diff --git a/database/util.go b/database/util.go
diff --git a/database/util_test.go b/database/util_test.go
diff --git a/database/yugabytedb/yugabytedb.go b/database/yugabytedb/yugabytedb.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,9 @@ import (`
`7`	`7`	`"net/url"`
`8`	`8`	`"strconv"`
`9`	`9`	`"strings"`
	`10`	`+ "sync/atomic"`
`10`	`11`	`"time"`
`11`	`12`
`12`		`- "go.uber.org/atomic"`
`13`		`-`
`14`	`13`	`"github.com/golang-migrate/migrate/v4"`
`15`	`14`	`"github.com/golang-migrate/migrate/v4/database"`
`16`	`15`	`"github.com/golang-migrate/migrate/v4/database/multistmt"`
`@@ -291,14 +290,14 @@ func (ch *ClickHouse) Drop() (err error) {`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`func (ch *ClickHouse) Lock() error {`
`294`		`- if !ch.isLocked.CAS(false, true) {`
	`293`	`+ if !ch.isLocked.CompareAndSwap(false, true) {`
`295`	`294`	`return database.ErrLocked`
`296`	`295`	`}`
`297`	`296`
`298`	`297`	`return nil`
`299`	`298`	`}`
`300`	`299`	`func (ch *ClickHouse) Unlock() error {`
`301`		`- if !ch.isLocked.CAS(true, false) {`
	`300`	`+ if !ch.isLocked.CompareAndSwap(true, false) {`
`302`	`301`	`return database.ErrNotLocked`
`303`	`302`	`}`
`304`	`303`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ import (`
`8`	`8`	`"fmt"`
`9`	`9`	`"io"`
`10`	`10`	`nurl "net/url"`
	`11`	`+ "sync/atomic"`
`11`	`12`
`12`	`13`	`"github.com/golang-migrate/migrate/v4"`
`13`	`14`	`"github.com/golang-migrate/migrate/v4/database"`
`14`	`15`	`"github.com/hashicorp/go-multierror"`
`15`	`16`	`_ "github.com/nakagami/firebirdsql"`
`16`		`- "go.uber.org/atomic"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`func init() {`
`@@ -107,14 +107,14 @@ func (f *Firebird) Close() error {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func (f *Firebird) Lock() error {`
`110`		`- if !f.isLocked.CAS(false, true) {`
	`110`	`+ if !f.isLocked.CompareAndSwap(false, true) {`
`111`	`111`	`return database.ErrLocked`
`112`	`112`	`}`
`113`	`113`	`return nil`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`func (f *Firebird) Unlock() error {`
`117`		`- if !f.isLocked.CAS(true, false) {`
	`117`	`+ if !f.isLocked.CompareAndSwap(true, false) {`
`118`	`118`	`return database.ErrNotLocked`
`119`	`119`	`}`
`120`	`120`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ import (`
`6`	`6`	`"io"`
`7`	`7`	`nurl "net/url"`
`8`	`8`	`"strings"`
	`9`	`+ "sync/atomic"`
`9`	`10`
`10`	`11`	`"github.com/hashicorp/go-multierror"`
`11`		`- "go.uber.org/atomic"`
`12`	`12`
`13`	`13`	`"github.com/golang-migrate/migrate/v4"`
`14`	`14`	`"github.com/golang-migrate/migrate/v4/database"`
`@@ -166,13 +166,13 @@ func (m *Ql) Drop() (err error) {`
`166`	`166`	`return nil`
`167`	`167`	`}`
`168`	`168`	`func (m *Ql) Lock() error {`
`169`		`- if !m.isLocked.CAS(false, true) {`
	`169`	`+ if !m.isLocked.CompareAndSwap(false, true) {`
`170`	`170`	`return database.ErrLocked`
`171`	`171`	`}`
`172`	`172`	`return nil`
`173`	`173`	`}`
`174`	`174`	`func (m *Ql) Unlock() error {`
`175`		`- if !m.isLocked.CAS(true, false) {`
	`175`	`+ if !m.isLocked.CompareAndSwap(true, false) {`
`176`	`176`	`return database.ErrNotLocked`
`177`	`177`	`}`
`178`	`178`	`return nil`