Merge pull request redis#1259 from go-redis/fix/unexport-lock-clone

Unexport Clone and Lock from embedded hooks
yliang9 · Feb 12, 2020 · 709e543 · 709e543
2 parents 6bd8d9c + 512e6c7
commit 709e543
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/cluster.go b/cluster.go
@@ -696,7 +696,7 @@ func (c *ClusterClient) WithContext(ctx context.Context) *ClusterClient {
 	}
 	clone := *c
 	clone.cmdable = clone.Process
-	clone.hooks.Lock()
+	clone.hooks.lock()
 	clone.ctx = ctx
 	return &clone
 }

diff --git a/redis.go b/redis.go
@@ -32,13 +32,13 @@ type hooks struct {
 	hooks []Hook
 }
 
-func (hs *hooks) Lock() {
+func (hs *hooks) lock() {
 	hs.hooks = hs.hooks[:len(hs.hooks):len(hs.hooks)]
 }
 
-func (hs hooks) Clone() hooks {
+func (hs hooks) clone() hooks {
 	clone := hs
-	clone.Lock()
+	clone.lock()
 	return clone
 }
 
@@ -526,7 +526,7 @@ func NewClient(opt *Options) *Client {
 func (c *Client) clone() *Client {
 	clone := *c
 	clone.cmdable = clone.Process
-	clone.hooks.Lock()
+	clone.hooks.lock()
 	return &clone
 }
 

diff --git a/ring.go b/ring.go
@@ -407,7 +407,7 @@ func (c *Ring) WithContext(ctx context.Context) *Ring {
 	}
 	clone := *c
 	clone.cmdable = clone.Process
-	clone.hooks.Lock()
+	clone.hooks.lock()
 	clone.ctx = ctx
 	return &clone
 }

diff --git a/tx.go b/tx.go
@@ -28,7 +28,7 @@ func (c *Client) newTx(ctx context.Context) *Tx {
 			opt:      c.opt,
 			connPool: pool.NewStickyConnPool(c.connPool.(*pool.ConnPool), true),
 		},
-		hooks: c.hooks.Clone(),
+		hooks: c.hooks.clone(),
 		ctx:   ctx,
 	}
 	tx.init()
@@ -50,7 +50,7 @@ func (c *Tx) WithContext(ctx context.Context) *Tx {
 	}
 	clone := *c
 	clone.init()
-	clone.hooks.Lock()
+	clone.hooks.lock()
 	clone.ctx = ctx
 	return &clone
 }