addressed more comments, fixed lint

Author: htemelski-redis

command.go

@@ -6832,6 +6832,12 @@ func (cmd *MonitorCmd) Stop() {
 	cmd.status = monitorStatusStop
 }
 
+func (cmd *MonitorCmd) Clone() Cmder {
+	// MonitorCmd cannot be safely cloned due to channels and goroutines
+	// Return a new MonitorCmd with the same channel
+	return newMonitorCmd(cmd.ctx, cmd.ch)
+}
+
 // ExtractCommandValue extracts the value from a command result using the fast enum-based approach
 func ExtractCommandValue(cmd interface{}) interface{} {
 	// First try to get the command type using the interface
@@ -6928,9 +6934,3 @@ func ExtractCommandValue(cmd interface{}) interface{} {
 	// If we can't get the command type, return nil
 	return nil
 }
-
-func (cmd *MonitorCmd) Clone() Cmder {
-	// MonitorCmd cannot be safely cloned due to channels and goroutines
-	// Return a new MonitorCmd with the same channel
-	return newMonitorCmd(cmd.ctx, cmd.ch)
-}

internal/routing/aggregator.go

@@ -1,6 +1,7 @@
 package routing
 
 import (
+	"errors"
 	"fmt"
 	"math"
 	"sync"
@@ -9,6 +10,13 @@ import (
 	"github.com/redis/go-redis/v9/internal/util"
 )
 
+var (
+	ErrMaxAggregation = errors.New("redis: no valid results to aggregate for max operation")
+	ErrMinAggregation = errors.New("redis: no valid results to aggregate for min operation")
+	ErrAndAggregation = errors.New("redis: no valid results to aggregate for logical AND operation")
+	ErrOrAggregation  = errors.New("redis: no valid results to aggregate for logical OR operation")
+)
+
 // ResponseAggregator defines the interface for aggregating responses from multiple shards.
 type ResponseAggregator interface {
 	// Add processes a single shard response.
@@ -171,11 +179,6 @@ func (a *AggSumAggregator) Result() (interface{}, error) {
 type AggMinAggregator struct {
 	err atomic.Value
 	res *util.AtomicMin
-
-	mu        sync.Mutex
-	min       int64
-	hasResult bool
-	firstErr  error
 }
 
 func (a *AggMinAggregator) Add(result interface{}, err error) error {
@@ -207,7 +210,7 @@ func (a *AggMinAggregator) Result() (interface{}, error) {
 
 	val, hasVal := a.res.Min()
 	if !hasVal {
-		return nil, fmt.Errorf("redis: no valid results to aggregate for min operation")
+		return nil, ErrMinAggregation
 	}
 	return val, nil
 }
@@ -247,7 +250,7 @@ func (a *AggMaxAggregator) Result() (interface{}, error) {
 
 	val, hasVal := a.res.Max()
 	if !hasVal {
-		return nil, fmt.Errorf("redis: no valid results to aggregate for max operation")
+		return nil, ErrMaxAggregation
 	}
 	return val, nil
 }
@@ -293,7 +296,7 @@ func (a *AggLogicalAndAggregator) Result() (interface{}, error) {
 	}
 
 	if !a.hasResult.Load() {
-		return nil, fmt.Errorf("redis: no valid results to aggregate for logical AND operation")
+		return nil, ErrAndAggregation
 	}
 	return a.res.Load() != 0, nil
 }
@@ -339,7 +342,7 @@ func (a *AggLogicalOrAggregator) Result() (interface{}, error) {
 	}
 
 	if !a.hasResult.Load() {
-		return nil, fmt.Errorf("redis: no valid results to aggregate for logical OR operation")
+		return nil, ErrOrAggregation
 	}
 	return a.res.Load() != 0, nil
 }
@@ -533,13 +536,6 @@ func (a *SpecialAggregator) Result() (interface{}, error) {
 	return nil, nil
 }
 
-// SetAggregatorFunc allows setting custom aggregation logic for special commands.
-func (a *SpecialAggregator) SetAggregatorFunc(fn func([]interface{}, []error) (interface{}, error)) {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	a.aggregatorFunc = fn
-}
-
 // SpecialAggregatorRegistry holds custom aggregation functions for specific commands.
 var SpecialAggregatorRegistry = make(map[string]func([]interface{}, []error) (interface{}, error))
 
@@ -552,7 +548,7 @@ func RegisterSpecialAggregator(cmdName string, fn func([]interface{}, []error) (
 func NewSpecialAggregator(cmdName string) *SpecialAggregator {
 	agg := &SpecialAggregator{}
 	if fn, exists := SpecialAggregatorRegistry[cmdName]; exists {
-		agg.SetAggregatorFunc(fn)
+		agg.aggregatorFunc = fn
 	}
 	return agg
 }

osscluster.go

@@ -1865,7 +1865,7 @@ func (c *ClusterClient) cmdsInfo(ctx context.Context) (map[string]*CommandInfo,
 func (c *ClusterClient) cmdInfo(ctx context.Context, name string) *CommandInfo {
 	// Use a separate context that won't be canceled to ensure command info lookup
 	// doesn't fail due to original context cancellation
-	cmdInfoCtx := context.Background()
+	cmdInfoCtx := c.context(ctx)
 	if c.opt.ContextTimeoutEnabled && ctx != nil {
 		// If context timeout is enabled, still use a reasonable timeout
 		var cancel context.CancelFunc
@@ -1875,13 +1875,13 @@ func (c *ClusterClient) cmdInfo(ctx context.Context, name string) *CommandInfo {
 
 	cmdsInfo, err := c.cmdsInfoCache.Get(cmdInfoCtx)
 	if err != nil {
-		internal.Logger.Printf(context.TODO(), "getting command info: %s", err)
+		internal.Logger.Printf(cmdInfoCtx, "getting command info: %s", err)
 		return nil
 	}
 
 	info := cmdsInfo[name]
 	if info == nil {
-		internal.Logger.Printf(context.TODO(), "info for cmd=%s not found", name)
+		internal.Logger.Printf(cmdInfoCtx, "info for cmd=%s not found", name)
 	}
 	return info
 }