added nil safety assertions

Author: htemelski-redis

command_policy_resolver.go

@@ -117,18 +117,20 @@ var defaultPolicies = map[module]map[commandName]*routing.CommandPolicy{
 	},
 }
 
-type CommandInfoResolver struct {
-	resolve          func(ctx context.Context, cmd Cmder) *routing.CommandPolicy
-	fallBackResolver *CommandInfoResolver
+type CommandInfoResolveFunc func(ctx context.Context, cmd Cmder) *routing.CommandPolicy
+
+type commandInfoResolver struct {
+	resolveFunc      CommandInfoResolveFunc
+	fallBackResolver *commandInfoResolver
 }
 
-func NewCommandInfoResolver(resolver func(ctx context.Context, cmd Cmder) *routing.CommandPolicy) *CommandInfoResolver {
-	return &CommandInfoResolver{
-		resolve: resolver,
+func NewCommandInfoResolver(resolveFunc CommandInfoResolveFunc) *commandInfoResolver {
+	return &commandInfoResolver{
+		resolveFunc: resolveFunc,
 	}
 }
 
-func NewDefaultCommandPolicyResolver() *CommandInfoResolver {
+func NewDefaultCommandPolicyResolver() *commandInfoResolver {
 	return NewCommandInfoResolver(func(ctx context.Context, cmd Cmder) *routing.CommandPolicy {
 		module := "core"
 		command := cmd.Name()
@@ -146,12 +148,12 @@ func NewDefaultCommandPolicyResolver() *CommandInfoResolver {
 	})
 }
 
-func (r *CommandInfoResolver) GetCommandPolicy(ctx context.Context, cmd Cmder) *routing.CommandPolicy {
-	if r.resolve == nil {
+func (r *commandInfoResolver) GetCommandPolicy(ctx context.Context, cmd Cmder) *routing.CommandPolicy {
+	if r.resolveFunc == nil {
 		return nil
 	}
 
-	policy := r.resolve(ctx, cmd)
+	policy := r.resolveFunc(ctx, cmd)
 	if policy != nil {
 		return policy
 	}
@@ -163,6 +165,6 @@ func (r *CommandInfoResolver) GetCommandPolicy(ctx context.Context, cmd Cmder) *
 	return nil
 }
 
-func (r *CommandInfoResolver) SetFallbackResolver(fallbackResolver *CommandInfoResolver) {
+func (r *commandInfoResolver) SetFallbackResolver(fallbackResolver *commandInfoResolver) {
 	r.fallBackResolver = fallbackResolver
 }

osscluster.go

@@ -925,7 +925,7 @@ type ClusterClient struct {
 	nodes           *clusterNodes
 	state           *clusterStateHolder
 	cmdsInfoCache   *cmdsInfoCache
-	cmdInfoResolver *CommandInfoResolver
+	cmdInfoResolver *commandInfoResolver
 	cmdable
 	hooksMixin
 }
@@ -1340,7 +1340,10 @@ 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)
+			var policy *routing.CommandPolicy
+			if c.cmdInfoResolver != nil {
+				policy = c.cmdInfoResolver.GetCommandPolicy(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 +1360,10 @@ func (c *ClusterClient) mapCmdsByNode(ctx context.Context, cmdsMap *cmdsMap, cmd
 	}
 
 	for _, cmd := range cmds {
-		policy := c.extractCommandInfo(ctx, cmd)
+		var policy *routing.CommandPolicy
+		if c.cmdInfoResolver != nil {
+			policy = c.cmdInfoResolver.GetCommandPolicy(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(),
@@ -1982,11 +1988,11 @@ func (c *ClusterClient) context(ctx context.Context) context.Context {
 	return context.Background()
 }
 
-func (c *ClusterClient) GetResolver() *CommandInfoResolver {
+func (c *ClusterClient) GetResolver() *commandInfoResolver {
 	return c.cmdInfoResolver
 }
 
-func (c *ClusterClient) SetCommandInfoResolver(cmdInfoResolver *CommandInfoResolver) {
+func (c *ClusterClient) SetCommandInfoResolver(cmdInfoResolver *commandInfoResolver) {
 	c.cmdInfoResolver = cmdInfoResolver
 }
 
@@ -2001,9 +2007,9 @@ func (c *ClusterClient) extractCommandInfo(ctx context.Context, cmd Cmder) *rout
 
 // NewDynamicResolver returns a CommandInfoResolver
 // that uses the underlying cmdInfo cache to resolve the policies
-func (c *ClusterClient) NewDynamicResolver() *CommandInfoResolver {
-	return &CommandInfoResolver{
-		resolve: c.extractCommandInfo,
+func (c *ClusterClient) NewDynamicResolver() *commandInfoResolver {
+	return &commandInfoResolver{
+		resolveFunc: c.extractCommandInfo,
 	}
 }
 

osscluster_router.go

@@ -21,7 +21,11 @@ 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)
+	var policy *routing.CommandPolicy
+	if c.cmdInfoResolver != nil {
+		policy = c.cmdInfoResolver.GetCommandPolicy(ctx, cmd)
+	}
+
 	if policy == nil {
 		return c.executeDefault(ctx, cmd, node)
 	}