removed the interface, slight refactor

Author: htemelski-redis

command_policy_resolver.go

@@ -117,37 +117,40 @@ var defaultPolicies = map[module]map[commandName]*routing.CommandPolicy{
 	},
 }
 
-type CommandInfoResolver interface {
-	GetCommandPolicy(ctx context.Context, cmdName string) *routing.CommandPolicy
-	SetFallbackResolver(fallback CommandInfoResolver)
+type CommandInfoResolver struct {
+	resolve          func(ctx context.Context, cmdName string) *routing.CommandPolicy
+	fallBackResolver *CommandInfoResolver
 }
 
-type internalCommandInfoResolver struct {
-	resolve          func(ctx context.Context, cmdName string) *routing.CommandPolicy
-	fallBackResolver CommandInfoResolver
+func NewCommandInfoResolver(resolver func(ctx context.Context, cmdName string) *routing.CommandPolicy) *CommandInfoResolver {
+	return &CommandInfoResolver{
+		resolve: resolver,
+	}
 }
 
-func NewDefaultCommandPolicyResolver() *internalCommandInfoResolver {
-	return &internalCommandInfoResolver{
-		resolve: func(ctx context.Context, cmdName string) *routing.CommandPolicy {
-			module := "core"
-			command := cmdName
-			cmdParts := strings.Split(cmdName, ".")
-			if len(cmdParts) == 2 {
-				module = cmdParts[0]
-				command = cmdParts[1]
-			}
+func NewDefaultCommandPolicyResolver() *CommandInfoResolver {
+	return NewCommandInfoResolver(func(ctx context.Context, cmdName string) *routing.CommandPolicy {
+		module := "core"
+		command := cmdName
+		cmdParts := strings.Split(cmdName, ".")
+		if len(cmdParts) == 2 {
+			module = cmdParts[0]
+			command = cmdParts[1]
+		}
 
-			if policy, ok := defaultPolicies[module][command]; ok {
-				return policy
-			}
+		if policy, ok := defaultPolicies[module][command]; ok {
+			return policy
+		}
 
-			return nil
-		},
-	}
+		return nil
+	})
 }
 
-func (r *internalCommandInfoResolver) GetCommandPolicy(ctx context.Context, cmdName string) *routing.CommandPolicy {
+func (r *CommandInfoResolver) GetCommandPolicy(ctx context.Context, cmdName string) *routing.CommandPolicy {
+	if r.resolve == nil {
+		return nil
+	}
+
 	policy := r.resolve(ctx, cmdName)
 	if policy != nil {
 		return policy
@@ -160,6 +163,6 @@ func (r *internalCommandInfoResolver) GetCommandPolicy(ctx context.Context, cmdN
 	return nil
 }
 
-func (r *internalCommandInfoResolver) 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
 }
@@ -944,7 +944,9 @@ func NewClusterClient(opt *ClusterOptions) *ClusterClient {
 
 	c.state = newClusterStateHolder(c.loadState)
 
-	c.cmdInfoResolver = c.NewDynamicResolver()
+	dynamicResolver := c.NewDynamicResolver()
+	dynamicResolver.SetFallbackResolver(NewDefaultCommandPolicyResolver())
+	c.SetCommandInfoResolver(dynamicResolver)
 
 	c.cmdable = c.Process
 	c.initHooks(hooks{
@@ -1980,11 +1982,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
 }
 
@@ -1997,8 +1999,10 @@ func (c *ClusterClient) extractCommandInfo(ctx context.Context, cmdName string)
 	return nil
 }
 
-func (c *ClusterClient) NewDynamicResolver() CommandInfoResolver {
-	return &internalCommandInfoResolver{
+// NewDynamicResolver returns a CommandInfoResolver
+// that uses the underlying cmdInfo cache to resolve the policies
+func (c *ClusterClient) NewDynamicResolver() *CommandInfoResolver {
+	return &CommandInfoResolver{
 		resolve: c.extractCommandInfo,
 	}
 }