change func signature from cmdName to cmder

Author: htemelski-redis

command_policy_resolver.go

@@ -118,21 +118,21 @@ var defaultPolicies = map[module]map[commandName]*routing.CommandPolicy{
 }
 
 type CommandInfoResolver struct {
-	resolve          func(ctx context.Context, cmdName string) *routing.CommandPolicy
+	resolve          func(ctx context.Context, cmd Cmder) *routing.CommandPolicy
 	fallBackResolver *CommandInfoResolver
 }
 
-func NewCommandInfoResolver(resolver func(ctx context.Context, cmdName string) *routing.CommandPolicy) *CommandInfoResolver {
+func NewCommandInfoResolver(resolver func(ctx context.Context, cmd Cmder) *routing.CommandPolicy) *CommandInfoResolver {
 	return &CommandInfoResolver{
 		resolve: resolver,
 	}
 }
 
 func NewDefaultCommandPolicyResolver() *CommandInfoResolver {
-	return NewCommandInfoResolver(func(ctx context.Context, cmdName string) *routing.CommandPolicy {
+	return NewCommandInfoResolver(func(ctx context.Context, cmd Cmder) *routing.CommandPolicy {
 		module := "core"
-		command := cmdName
-		cmdParts := strings.Split(cmdName, ".")
+		command := cmd.Name()
+		cmdParts := strings.Split(command, ".")
 		if len(cmdParts) == 2 {
 			module = cmdParts[0]
 			command = cmdParts[1]
@@ -146,18 +146,18 @@ func NewDefaultCommandPolicyResolver() *CommandInfoResolver {
 	})
 }
 
-func (r *CommandInfoResolver) GetCommandPolicy(ctx context.Context, cmdName string) *routing.CommandPolicy {
+func (r *CommandInfoResolver) GetCommandPolicy(ctx context.Context, cmd Cmder) *routing.CommandPolicy {
 	if r.resolve == nil {
 		return nil
 	}
 
-	policy := r.resolve(ctx, cmdName)
+	policy := r.resolve(ctx, cmd)
 	if policy != nil {
 		return policy
 	}
 
 	if r.fallBackResolver != nil {
-		return r.fallBackResolver.GetCommandPolicy(ctx, cmdName)
+		return r.fallBackResolver.GetCommandPolicy(ctx, cmd)
 	}
 
 	return nil

osscluster.go

@@ -1340,7 +1340,7 @@ func (c *ClusterClient) mapCmdsByNode(ctx context.Context, cmdsMap *cmdsMap, cmd
 
 	if c.opt.ReadOnly && c.cmdsAreReadOnly(ctx, cmds) {
 		for _, cmd := range cmds {
-			policy := c.extractCommandInfo(ctx, cmd.Name())
+			policy := c.extractCommandInfo(ctx, cmd)
 			if policy != nil && !policy.CanBeUsedInPipeline() {
 				return fmt.Errorf(
 					"redis: cannot pipeline command %q with request policy ReqAllNodes/ReqAllShards/ReqMultiShard; Note: This behavior is subject to change in the future", cmd.Name(),
@@ -1357,7 +1357,7 @@ func (c *ClusterClient) mapCmdsByNode(ctx context.Context, cmdsMap *cmdsMap, cmd
 	}
 
 	for _, cmd := range cmds {
-		policy := c.extractCommandInfo(ctx, cmd.Name())
+		policy := c.extractCommandInfo(ctx, cmd)
 		if policy != nil && !policy.CanBeUsedInPipeline() {
 			return fmt.Errorf(
 				"redis: cannot pipeline command %q with request policy ReqAllNodes/ReqAllShards/ReqMultiShard; Note: This behavior is subject to change in the future", cmd.Name(),
@@ -1991,8 +1991,8 @@ func (c *ClusterClient) SetCommandInfoResolver(cmdInfoResolver *CommandInfoResol
 }
 
 // extractCommandInfo retrieves the routing policy for a command
-func (c *ClusterClient) extractCommandInfo(ctx context.Context, cmdName string) *routing.CommandPolicy {
-	if cmdInfo := c.cmdInfo(ctx, cmdName); cmdInfo != nil && cmdInfo.CommandPolicy != nil {
+func (c *ClusterClient) extractCommandInfo(ctx context.Context, cmd Cmder) *routing.CommandPolicy {
+	if cmdInfo := c.cmdInfo(ctx, cmd.Name()); cmdInfo != nil && cmdInfo.CommandPolicy != nil {
 		return cmdInfo.CommandPolicy
 	}
 

osscluster_router.go

@@ -21,7 +21,7 @@ type slotResult struct {
 
 // routeAndRun routes a command to the appropriate cluster nodes and executes it
 func (c *ClusterClient) routeAndRun(ctx context.Context, cmd Cmder, node *clusterNode) error {
-	policy := c.cmdInfoResolver.GetCommandPolicy(ctx, cmd.Name())
+	policy := c.cmdInfoResolver.GetCommandPolicy(ctx, cmd)
 	if policy == nil {
 		return c.executeDefault(ctx, cmd, node)
 	}