remove unused methods

Author: ndyakov

hitless/pool_hook_test.go

@@ -100,14 +100,6 @@ func (mp *mockPool) RemovePoolHook(hook pool.PoolHook) {
 	// Mock implementation - do nothing
 }
 
-func (mp *mockPool) TrackConn(conn *pool.Conn) {
-	// Mock implementation - do nothing
-}
-
-func (mp *mockPool) UntrackConn(conn *pool.Conn) {
-	// Mock implementation - do nothing
-}
-
 func (mp *mockPool) Close() error {
 	return nil
 }

internal/pool/pool.go

@@ -70,9 +70,6 @@ type Pooler interface {
 	AddPoolHook(hook PoolHook)
 	RemovePoolHook(hook PoolHook)
 
-	TrackConn(*Conn)
-	UntrackConn(*Conn)
-
 	Close() error
 }
 
@@ -758,15 +755,4 @@ func (p *ConnPool) isHealthyConn(cn *Conn, now time.Time) bool {
 	return true
 }
 
-func (p *ConnPool) TrackConn(cn *Conn) {
-	p.connsMu.Lock()
-	p.poolSize.Add(1)
-	p.conns[cn.GetID()] = cn
-	p.connsMu.Unlock()
-}
 
-func (p *ConnPool) UntrackConn(cn *Conn) {
-	p.connsMu.Lock()
-	delete(p.conns, cn.GetID())
-	p.connsMu.Unlock()
-}

internal/pool/pool_single.go

@@ -62,7 +62,3 @@ func (p *SingleConnPool) Stats() *Stats {
 func (p *SingleConnPool) AddPoolHook(hook PoolHook) {}
 
 func (p *SingleConnPool) RemovePoolHook(hook PoolHook) {}
-
-func (p *SingleConnPool) TrackConn(cn *Conn) {}
-
-func (p *SingleConnPool) UntrackConn(cn *Conn) {}

internal/pool/pool_sticky.go

@@ -203,7 +203,3 @@ func (p *StickyConnPool) Stats() *Stats {
 func (p *StickyConnPool) AddPoolHook(hook PoolHook) {}
 
 func (p *StickyConnPool) RemovePoolHook(hook PoolHook) {}
-
-func (p *StickyConnPool) TrackConn(cn *Conn) {}
-
-func (p *StickyConnPool) UntrackConn(cn *Conn) {}

osscluster.go

@@ -1883,7 +1883,9 @@ func (c *ClusterClient) pubSub() *PubSub {
 			return cn, nil
 		},
 		closeConn: func(cn *pool.Conn) error {
-			err := node.Client.connPool.CloseConn(cn)
+			// Untrack connection from PubSubPool
+			node.Client.pubSubPool.UntrackConn(cn)
+			err := cn.Close()
 			node = nil
 			return err
 		},

redis.go

@@ -1061,10 +1061,12 @@ func (c *Client) pubSub() *PubSub {
 				_ = cn.Close()
 				return nil, err
 			}
+			// Track connection in PubSubPool
 			c.pubSubPool.TrackConn(cn)
 			return cn, nil
 		},
 		closeConn: func(cn *pool.Conn) error {
+			// Untrack connection from PubSubPool
 			c.pubSubPool.UntrackConn(cn)
 			_ = cn.Close()
 			return nil

sentinel.go

@@ -580,22 +580,23 @@ func (c *SentinelClient) pubSub() *PubSub {
 	pubsub := &PubSub{
 		opt: c.opt,
 		newConn: func(ctx context.Context, addr string, channels []string) (*pool.Conn, error) {
-			netConn, err := c.dialHook(ctx, c.opt.Network, addr)
+			cn, err := c.pubSubPool.NewConn(ctx, c.opt.Network, addr, channels)
 			if err != nil {
 				return nil, err
 			}
-			cn := pool.NewConnWithBufferSize(netConn, c.opt.ReadBufferSize, c.opt.WriteBufferSize)
-
 			// will return nil if already initialized
 			err = c.initConn(ctx, cn)
 			if err != nil {
 				_ = cn.Close()
 				return nil, err
 			}
-
+			// Track connection in PubSubPool
+			c.pubSubPool.TrackConn(cn)
 			return cn, nil
 		},
 		closeConn: func(cn *pool.Conn) error {
+			// Untrack connection from PubSubPool
+			c.pubSubPool.UntrackConn(cn)
 			_ = cn.Close()
 			return nil
 		},