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

Merge pull request #440 from go-redis/fix/cmd-info-check 

Simplify cmdInfo check.
This commit is contained in:
Vladimir Mihailenco 2016-12-09 16:02:40 +02:00 committed by GitHub
parent 4ce47a025f 420337dc4a
commit 7f2a0bff84
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster.go
View File

@ -1,7 +1,6 @@
package redis
import (
"fmt"
"math/rand"
"sync"
"sync/atomic"
@ -367,14 +366,12 @@ func (c *ClusterClient) state() *clusterState {
func (c *ClusterClient) cmdSlotAndNode(state *clusterState, cmd Cmder) (int, *clusterNode, error) {
cmdInfo := c.cmds[cmd.arg(0)]
firstKey := cmd.arg(cmdFirstKeyPos(cmd, cmdInfo))
if firstKey == "" {
if firstKey == "" || cmdInfo == nil {
node, err := c.nodes.Random()
return -1, node, err
}
slot := hashtag.Slot(firstKey)
if cmdInfo == nil {
return -1, nil, internal.RedisError(fmt.Sprintf("cmdInfo of %s is nil", cmd.arg(0)))
}
if cmdInfo.ReadOnly && c.opt.ReadOnly {
if c.opt.RouteByLatency {
node, err := state.slotClosestNode(slot)