Skip to content

Commit 6db779e

Browse files
committed
feat: rename some API
1 parent 19ffe0b commit 6db779e

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

mysql.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (p *mysqlProvider) init() error {
6363
return nil
6464
}
6565

66-
func (p *mysqlProvider) Lock(lock LockInfo) error {
66+
func (p *mysqlProvider) Lock(lock NamedLock) error {
6767
now := time.Now()
6868
expireAt := now.Add(lock.GetLifetime())
6969
rs, err := p.lockStmt.Exec(
@@ -86,7 +86,7 @@ func (p *mysqlProvider) Lock(lock LockInfo) error {
8686
return nil
8787
}
8888

89-
func (p *mysqlProvider) Unlock(lock LockInfo) error {
89+
func (p *mysqlProvider) Unlock(lock NamedLock) error {
9090
rs, err := p.unlockStmt.Exec(
9191
lock.GetLockId(),
9292
lock.GetLockOwner(),

postgres.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (p *postgreSQLProvider) init() error {
5656
return nil
5757
}
5858

59-
func (p *postgreSQLProvider) Lock(lock LockInfo) error {
59+
func (p *postgreSQLProvider) Lock(lock NamedLock) error {
6060
now := time.Now()
6161
expireAt := now.Add(lock.GetLifetime())
6262
rs, err := p.lockStmt.Exec(
@@ -72,14 +72,13 @@ func (p *postgreSQLProvider) Lock(lock LockInfo) error {
7272
if err != nil {
7373
return fmt.Errorf("get affected rows: %w", err)
7474
}
75-
println("lock affected:", affected)
7675
if affected == 0 {
7776
return ErrAlreadyLocked
7877
}
7978
return nil
8079
}
8180

82-
func (p *postgreSQLProvider) Unlock(lock LockInfo) error {
81+
func (p *postgreSQLProvider) Unlock(lock NamedLock) error {
8382
rs, err := p.unlockStmt.Exec(
8483
lock.GetLockId(),
8584
lock.GetLockOwner(),
@@ -92,7 +91,6 @@ func (p *postgreSQLProvider) Unlock(lock LockInfo) error {
9291
if err != nil {
9392
return fmt.Errorf("get affected rows: %w", err)
9493
}
95-
println("unlock affected:", affected)
9694
if affected == 0 {
9795
return ErrNotLocked
9896
}

provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ package distlock
22

33
import "time"
44

5-
type LockInfo interface {
5+
type NamedLock interface {
66
GetLockId() string
77
GetLockOwner() string
88
GetLifetime() time.Duration
99
}
1010

1111
type Provider interface {
1212
Name() string
13-
Lock(info LockInfo) error
14-
Unlock(info LockInfo) error
13+
Lock(info NamedLock) error
14+
Unlock(info NamedLock) error
1515
}
1616

1717
type Mutex interface {

redis.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ const (
1717
`
1818
)
1919

20-
// Pool represents a pool of redis connections.
21-
type Pool interface {
20+
// RedisPool represents a pool of redis connections.
21+
type RedisPool interface {
2222
// Get returns a connection from the pool.
2323
Get() redis.Conn
2424
}
2525

2626
type redisProvider struct {
27-
pool Pool
27+
pool RedisPool
2828
}
2929

30-
func NewRedisProvider(redisPool Pool) (Provider, error) {
30+
func NewRedisProvider(redisPool RedisPool) (Provider, error) {
3131
return &redisProvider{
3232
pool: redisPool,
3333
}, nil
@@ -37,7 +37,7 @@ func (p *redisProvider) Name() string {
3737
return "redis"
3838
}
3939

40-
func (p *redisProvider) Lock(lock LockInfo) error {
40+
func (p *redisProvider) Lock(lock NamedLock) error {
4141
conn := p.pool.Get()
4242
defer conn.Close()
4343

@@ -59,7 +59,7 @@ func (p *redisProvider) Lock(lock LockInfo) error {
5959
return ErrAlreadyLocked
6060
}
6161

62-
func (p *redisProvider) Unlock(lock LockInfo) error {
62+
func (p *redisProvider) Unlock(lock NamedLock) error {
6363
conn := p.pool.Get()
6464
defer conn.Close()
6565

0 commit comments

Comments
 (0)