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

refactor: remove unused context attribute from conn (#2150)

This commit is contained in:
Knut Zuidema 2022-07-13 07:49:28 +02:00 committed by GitHub
parent 9c34c5345f
commit 092a692384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example_test.go
View File

@ -155,7 +155,7 @@ func ExampleClient() {
}
func ExampleConn() {
conn := rdb.Conn(context.Background())
conn := rdb.Conn()
err := conn.ClientSetName(ctx, "foobar").Err()
if err != nil {

10
redis.go
View File

@ -225,7 +225,7 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
}
connPool := pool.NewSingleConnPool(c.connPool, cn)
conn := newConn(ctx, c.opt, connPool)
conn := newConn(c.opt, connPool)
var auth bool
@ -575,8 +575,8 @@ func (c *Client) WithTimeout(timeout time.Duration) *Client {
return clone
}
func (c *Client) Conn(ctx context.Context) *Conn {
return newConn(ctx, c.opt, pool.NewStickyConnPool(c.connPool))
func (c *Client) Conn() *Conn {
return newConn(c.opt, pool.NewStickyConnPool(c.connPool))
}
// Do creates a Cmd from the args and processes the cmd.
@ -707,10 +707,9 @@ type conn struct {
// for a continuous single Redis connection.
type Conn struct {
*conn
ctx context.Context
}
func newConn(ctx context.Context, opt *Options, connPool pool.Pooler) *Conn {
func newConn(opt *Options, connPool pool.Pooler) *Conn {
c := Conn{
conn: &conn{
baseClient: baseClient{
@ -718,7 +717,6 @@ func newConn(ctx context.Context, opt *Options, connPool pool.Pooler) *Conn {
connPool: connPool,
},
},
ctx: ctx,
}
c.cmdable = c.Process
c.statefulCmdable = c.Process

2
redis_test.go
View File

@ -296,7 +296,7 @@ var _ = Describe("Client", func() {
})
It("should Conn", func() {
err := client.Conn(ctx).Get(ctx, "this-key-does-not-exist").Err()
err := client.Conn().Get(ctx, "this-key-does-not-exist").Err()
Expect(err).To(Equal(redis.Nil))
})