redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

Move Select to stateful commands and make it available only via Pipeline and Tx.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2016-06-05 09:45:39 +00:00
parent 5a2dda6d40
commit ac162eb843
13 changed files with 481 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
redis.go
View File

@ -56,29 +56,25 @@ func (c *baseClient) initConn(cn *pool.Conn) error {
// Temp client for Auth and Select.
client := newClient(c.opt, pool.NewSingleConnPool(cn))
if c.opt.Password != "" {
if err := client.Auth(c.opt.Password).Err(); err != nil {
return err
_, err := client.Pipelined(func(pipe *Pipeline) error {
if c.opt.Password != "" {
pipe.Auth(c.opt.Password)
}
}
if c.opt.DB > 0 {
if err := client.Select(c.opt.DB).Err(); err != nil {
return err
if c.opt.DB > 0 {
pipe.Select(c.opt.DB)
}
}
if c.opt.ReadOnly {
if err := client.ReadOnly().Err(); err != nil {
return err
if c.opt.ReadOnly {
pipe.ReadOnly()
}
}
return nil
return nil
})
return err
}
func (c *baseClient) process(cmd Cmder) {
func (c *baseClient) Process(cmd Cmder) {
for i := 0; i <= c.opt.MaxRetries; i++ {
if i > 0 {
cmd.reset()
@ -145,16 +141,14 @@ func (c *baseClient) Close() error {
// goroutines.
type Client struct {
baseClient
commandable
cmdable
}
func newClient(opt *Options, pool pool.Pooler) *Client {
base := baseClient{opt: opt, connPool: pool}
client := &Client{
baseClient: base,
commandable: commandable{
process: base.process,
},
cmdable: cmdable{base.Process},
}
return client
}
@ -178,11 +172,12 @@ func (c *Client) PoolStats() *PoolStats {
}
func (c *Client) Pipeline() *Pipeline {
pipe := &Pipeline{
pipe := Pipeline{
exec: c.pipelineExec,
}
pipe.commandable.process = pipe.process
return pipe
pipe.cmdable.process = pipe.Process
pipe.statefulCmdable.process = pipe.Process
return &pipe
}
func (c *Client) Pipelined(fn func(*Pipeline) error) ([]Cmder, error) {