refactor: Remove uber atomic in favor of stdlib

romshark · romshark · commit 361a77129e6e · 2025-07-27T12:13:43.000+02:00
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
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -291,14 +291,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
@@ -9,12 +9,13 @@ import (
 	"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
@@ -9,11 +9,12 @@ import (
 	"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 +108,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
@@ -9,14 +9,15 @@ import (
 	"strconv"
 	"time"
 
+	"sync/atomic"
+
 	"github.com/cenkalti/backoff/v4"
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/hashicorp/go-multierror"
 	"go.mongodb.org/mongo-driver/bson"
 	"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
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/golang-migrate/migrate/v4/database"
diff --git a/database/pgx/pgx.go b/database/pgx/pgx.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
diff --git a/database/pgx/v5/pgx.go b/database/pgx/v5/pgx.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
diff --git a/database/ql/ql.go b/database/ql/ql.go
@@ -7,8 +7,9 @@ import (
 	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 +167,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
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -127,14 +127,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
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -143,7 +143,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 +152,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
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/hashicorp/go-multierror"
@@ -159,14 +159,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
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -178,14 +178,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
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.uber.org/atomic"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database"
@@ -178,14 +178,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
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`	`"time"`
`11`	`11`
`12`		`- "go.uber.org/atomic"`
	`12`	`+ "sync/atomic"`
`13`	`13`
`14`	`14`	`"github.com/golang-migrate/migrate/v4"`
`15`	`15`	`"github.com/golang-migrate/migrate/v4/database"`
`@@ -291,14 +291,14 @@ func (ch *ClickHouse) Drop() (err error) {`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`func (ch *ClickHouse) Lock() error {`
`294`		`- if !ch.isLocked.CAS(false, true) {`
	`294`	`+ if !ch.isLocked.CompareAndSwap(false, true) {`
`295`	`295`	`return database.ErrLocked`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`return nil`
`299`	`299`	`}`
`300`	`300`	`func (ch *ClickHouse) Unlock() error {`
`301`		`- if !ch.isLocked.CAS(true, false) {`
	`301`	`+ if !ch.isLocked.CompareAndSwap(true, false) {`
`302`	`302`	`return database.ErrNotLocked`
`303`	`303`	`}`
`304`	`304`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,12 @@ import (`
`9`	`9`	`"io"`
`10`	`10`	`nurl "net/url"`
`11`	`11`
	`12`	`+ "sync/atomic"`
	`13`	`+`
`12`	`14`	`"github.com/golang-migrate/migrate/v4"`
`13`	`15`	`"github.com/golang-migrate/migrate/v4/database"`
`14`	`16`	`"github.com/hashicorp/go-multierror"`
`15`	`17`	`_ "github.com/nakagami/firebirdsql"`
`16`		`- "go.uber.org/atomic"`
`17`	`18`	`)`
`18`	`19`
`19`	`20`	`func init() {`
`@@ -107,14 +108,14 @@ func (f *Firebird) Close() error {`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`func (f *Firebird) Lock() error {`
`110`		`- if !f.isLocked.CAS(false, true) {`
	`111`	`+ if !f.isLocked.CompareAndSwap(false, true) {`
`111`	`112`	`return database.ErrLocked`
`112`	`113`	`}`
`113`	`114`	`return nil`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`func (f *Firebird) Unlock() error {`
`117`		`- if !f.isLocked.CAS(true, false) {`
	`118`	`+ if !f.isLocked.CompareAndSwap(true, false) {`
`118`	`119`	`return database.ErrNotLocked`
`119`	`120`	`}`
`120`	`121`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@ import (`
`7`	`7`	`nurl "net/url"`
`8`	`8`	`"strings"`
`9`	`9`
	`10`	`+ "sync/atomic"`
	`11`	`+`
`10`	`12`	`"github.com/hashicorp/go-multierror"`
`11`		`- "go.uber.org/atomic"`
`12`	`13`
`13`	`14`	`"github.com/golang-migrate/migrate/v4"`
`14`	`15`	`"github.com/golang-migrate/migrate/v4/database"`
`@@ -166,13 +167,13 @@ func (m *Ql) Drop() (err error) {`
`166`	`167`	`return nil`
`167`	`168`	`}`
`168`	`169`	`func (m *Ql) Lock() error {`
`169`		`- if !m.isLocked.CAS(false, true) {`
	`170`	`+ if !m.isLocked.CompareAndSwap(false, true) {`
`170`	`171`	`return database.ErrLocked`
`171`	`172`	`}`
`172`	`173`	`return nil`
`173`	`174`	`}`
`174`	`175`	`func (m *Ql) Unlock() error {`
`175`		`- if !m.isLocked.CAS(true, false) {`
	`176`	`+ if !m.isLocked.CompareAndSwap(true, false) {`
`176`	`177`	`return database.ErrNotLocked`
`177`	`178`	`}`
`178`	`179`	`return nil`