re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Vladimir Mihailenco 2019-06-14 16:00:03 +03:00
parent c0e70ad31d
commit 880e05d975
7 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster.go
View File

@ -1445,7 +1445,7 @@ func (c *ClusterClient) pubSub() *PubSub {
return nil, err return nil, err
} }
cn, err := node.Client.newConn() cn, err := node.Client.newConn(context.TODO())
if err != nil { if err != nil {
node = nil node = nil

15
internal/pool/conn.go
View File

@ -95,7 +95,10 @@ func (cn *Conn) deadline(ctx context.Context, timeout time.Duration) time.Time {
if timeout == 0 { if timeout == 0 {
return deadline return deadline
} }
return minNonzeroTime(deadline, tm) if deadline.Before(tm) {
return deadline
}
return tm
} }
} }
@ -105,13 +108,3 @@ func (cn *Conn) deadline(ctx context.Context, timeout time.Duration) time.Time {
return noDeadline return noDeadline
} }
func minNonzeroTime(a, b time.Time) time.Time {
if a.IsZero() {
return b
}
if b.IsZero() || a.Before(b) {
return a
}
return b
}

8
internal/pool/pool.go
View File

@ -34,7 +34,7 @@ type Stats struct {
} }
type Pooler interface { type Pooler interface {
NewConn() (*Conn, error) NewConn(context.Context) (*Conn, error)
CloseConn(*Conn) error CloseConn(*Conn) error
Get(context.Context) (*Conn, error) Get(context.Context) (*Conn, error)
@ -115,7 +115,7 @@ func (p *ConnPool) checkMinIdleConns() {
} }
func (p *ConnPool) addIdleConn() { func (p *ConnPool) addIdleConn() {
cn, err := p.newConn(nil, true) cn, err := p.newConn(context.TODO(), true)
if err != nil { if err != nil {
return return
} }
@ -126,8 +126,8 @@ func (p *ConnPool) addIdleConn() {
p.connsMu.Unlock() p.connsMu.Unlock()
} }
func (p *ConnPool) NewConn() (*Conn, error) { func (p *ConnPool) NewConn(ctx context.Context) (*Conn, error) {
return p._NewConn(nil, false) return p._NewConn(ctx, false)
} }
func (p *ConnPool) _NewConn(ctx context.Context, pooled bool) (*Conn, error) { func (p *ConnPool) _NewConn(ctx context.Context, pooled bool) (*Conn, error) {

2
internal/pool/pool_single.go
View File

@ -14,7 +14,7 @@ func NewSingleConnPool(cn *Conn) *SingleConnPool {
} }
} }
func (p *SingleConnPool) NewConn() (*Conn, error) { func (p *SingleConnPool) NewConn(context.Context) (*Conn, error) {
panic("not implemented") panic("not implemented")
} }

2
internal/pool/pool_sticky.go
View File

@ -23,7 +23,7 @@ func NewStickyConnPool(pool *ConnPool, reusable bool) *StickyConnPool {
} }
} }
func (p *StickyConnPool) NewConn() (*Conn, error) { func (p *StickyConnPool) NewConn(context.Context) (*Conn, error) {
panic("not implemented") panic("not implemented")
} }

6
redis.go
View File

@ -139,8 +139,8 @@ func (c *baseClient) String() string {
return fmt.Sprintf("Redis<%s db:%d>", c.getAddr(), c.opt.DB) return fmt.Sprintf("Redis<%s db:%d>", c.getAddr(), c.opt.DB)
} }
func (c *baseClient) newConn() (*pool.Conn, error) { func (c *baseClient) newConn(ctx context.Context) (*pool.Conn, error) {
cn, err := c.connPool.NewConn() cn, err := c.connPool.NewConn(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -581,7 +581,7 @@ func (c *Client) pubSub() *PubSub {
opt: c.opt, opt: c.opt,
newConn: func(channels []string) (*pool.Conn, error) { newConn: func(channels []string) (*pool.Conn, error) {
return c.newConn() return c.newConn(context.TODO())
}, },
closeConn: c.connPool.CloseConn, closeConn: c.connPool.CloseConn,
} }

2
sentinel.go
View File

@ -150,7 +150,7 @@ func (c *SentinelClient) pubSub() *PubSub {
opt: c.opt, opt: c.opt,
newConn: func(channels []string) (*pool.Conn, error) { newConn: func(channels []string) (*pool.Conn, error) {
return c.newConn() return c.newConn(context.TODO())
}, },
closeConn: c.connPool.CloseConn, closeConn: c.connPool.CloseConn,
} }