fix imports, update license date

Author: h44z

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Christoph Haas
+Copyright (c) 2022 Christoph Haas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

examples/example.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	"context"
+	"log"
+	"os"
+	"time"
+
 	"github.com/h44z/lightmigrate"
 	"github.com/h44z/lightmigrate-mongodb/mongodb"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
-	"log"
-	"os"
-	"time"
 )
 
 func main() {

mongodb/mongodb.go

@@ -3,15 +3,16 @@ package mongodb
 import (
 	"context"
 	"fmt"
-	"github.com/h44z/lightmigrate"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 	"io"
 	"io/ioutil"
 	"os"
 	"sync/atomic"
 	"time"
+
+	"github.com/h44z/lightmigrate"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 type versionInfo struct {
@@ -31,10 +32,10 @@ type lockFilter struct {
 }
 
 type driver struct {
-	client   *mongo.Client
-	cfg      *config
-	migDb    *mongo.Database // where migration info is stored
-	lockFlag int32           // must be accessed by atomic.XXX functions!
+	client            *mongo.Client
+	cfg               *config
+	migDb             *mongo.Database // where migration info is stored
+	reentrantLockFlag int32           // must be accessed by atomic.XXX functions!
 
 	logger  lightmigrate.Logger
 	verbose bool
@@ -128,7 +129,7 @@ func WithLocking(lockConfig LockingConfig) DriverOption {
 }
 
 func (d *driver) Close() error {
-	return nil // nothing to cleanup
+	return nil // nothing to clean up
 }
 
 // Lock utilizes advisory locking on the LockingConfig.CollectionName collection
@@ -139,7 +140,7 @@ func (d *driver) Lock() error {
 	}
 
 	// check if already locked, if not, lock
-	if !atomic.CompareAndSwapInt32(&d.lockFlag, 0, 1) {
+	if !atomic.CompareAndSwapInt32(&d.reentrantLockFlag, 0, 1) {
 		return nil // no swap happened, already locked
 	}
 
@@ -160,7 +161,7 @@ func (d *driver) Lock() error {
 	defer cancelFunc()
 	_, err = d.migDb.Collection(d.cfg.Locking.CollectionName).InsertOne(ctx, newLockObj)
 	if err != nil {
-		atomic.StoreInt32(&d.lockFlag, 0) // restore unlock flag
+		atomic.StoreInt32(&d.reentrantLockFlag, 0) // restore unlock flag
 		return ErrDatabaseLocked
 	}
 
@@ -173,7 +174,7 @@ func (d *driver) Unlock() error {
 	}
 
 	// check if already unlocked, if not, unlock
-	if !atomic.CompareAndSwapInt32(&d.lockFlag, 1, 0) {
+	if !atomic.CompareAndSwapInt32(&d.reentrantLockFlag, 1, 0) {
 		return nil // no swap happened, already unlocked
 	}
 
@@ -185,7 +186,7 @@ func (d *driver) Unlock() error {
 	defer cancelFunc()
 	_, err := d.migDb.Collection(d.cfg.Locking.CollectionName).DeleteMany(ctx, filter)
 	if err != nil {
-		atomic.StoreInt32(&d.lockFlag, 1) // restore lock flag
+		atomic.StoreInt32(&d.reentrantLockFlag, 1) // restore lock flag
 		return err
 	}
 

mongodb/mongodb_test.go

@@ -191,7 +191,7 @@ func Test_driver_Lock(t *testing.T) {
 		}
 
 		// should be locked
-		if atomic.LoadInt32(&d.(*driver).lockFlag) != 1 {
+		if atomic.LoadInt32(&d.(*driver).reentrantLockFlag) != 1 {
 			t.Fatalf("not locked")
 		}
 	})
@@ -215,7 +215,7 @@ func Test_driver_Lock(t *testing.T) {
 		}
 
 		// should not be locked
-		if atomic.LoadInt32(&d.(*driver).lockFlag) != 0 {
+		if atomic.LoadInt32(&d.(*driver).reentrantLockFlag) != 0 {
 			t.Fatalf("unexpected lock")
 		}
 	})
@@ -229,20 +229,20 @@ func Test_driver_Lock_Disabled(t *testing.T) {
 	}
 
 	// should not be locked
-	if atomic.LoadInt32(&d.lockFlag) == 1 {
+	if atomic.LoadInt32(&d.reentrantLockFlag) == 1 {
 		t.Fatalf("unexpected lock")
 	}
 }
 
 func Test_driver_Lock_AlreadyLocked(t *testing.T) {
-	d := driver{cfg: &config{Locking: LockingConfig{Enabled: true}}, lockFlag: 1}
+	d := driver{cfg: &config{Locking: LockingConfig{Enabled: true}}, reentrantLockFlag: 1}
 	err := d.Lock()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
 	// should be locked
-	if atomic.LoadInt32(&d.lockFlag) != 1 {
+	if atomic.LoadInt32(&d.reentrantLockFlag) != 1 {
 		t.Fatalf("not locked")
 	}
 }
@@ -408,7 +408,7 @@ func Test_driver_Unlock(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		d.(*driver).lockFlag = 1 // simulate locked driver
+		d.(*driver).reentrantLockFlag = 1 // simulate locked driver
 
 		mt.AddMockResponses(bson.D{{Key: "ok", Value: 1}, {Key: "acknowledged", Value: true}, {Key: "n", Value: 1}}) // n = 1 doc deleted
 
@@ -418,7 +418,7 @@ func Test_driver_Unlock(t *testing.T) {
 		}
 
 		// should not be locked
-		if atomic.LoadInt32(&d.(*driver).lockFlag) != 0 {
+		if atomic.LoadInt32(&d.(*driver).reentrantLockFlag) != 0 {
 			t.Fatalf("unexptected lock")
 		}
 	})
@@ -430,7 +430,7 @@ func Test_driver_Unlock(t *testing.T) {
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		d.(*driver).lockFlag = 1 // simulate locked driver
+		d.(*driver).reentrantLockFlag = 1 // simulate locked driver
 
 		mt.AddMockResponses(bson.D{{Key: "ok", Value: 0}, {Key: "acknowledged", Value: false}, {Key: "n", Value: 0}})
 
@@ -440,7 +440,7 @@ func Test_driver_Unlock(t *testing.T) {
 		}
 
 		// should still be locked
-		if atomic.LoadInt32(&d.(*driver).lockFlag) != 1 {
+		if atomic.LoadInt32(&d.(*driver).reentrantLockFlag) != 1 {
 			t.Fatalf("not locked")
 		}
 	})
@@ -454,20 +454,20 @@ func Test_driver_Unlock_Disabled(t *testing.T) {
 	}
 
 	// should not be locked
-	if atomic.LoadInt32(&d.lockFlag) != 0 {
+	if atomic.LoadInt32(&d.reentrantLockFlag) != 0 {
 		t.Fatalf("unexptected lock")
 	}
 }
 
 func Test_driver_Unlock_AlreadyUnlocked(t *testing.T) {
-	d := driver{cfg: &config{Locking: LockingConfig{Enabled: true}}, lockFlag: 0}
+	d := driver{cfg: &config{Locking: LockingConfig{Enabled: true}}, reentrantLockFlag: 0}
 	err := d.Unlock()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
 	// should not be locked
-	if atomic.LoadInt32(&d.lockFlag) != 0 {
+	if atomic.LoadInt32(&d.reentrantLockFlag) != 0 {
 		t.Fatalf("unexptected lock")
 	}
 }