@@ -526,8 +526,8 @@ func (c *clusterClient) toReplica(cmd Completed) bool {
526
526
return false
527
527
}
528
528
529
- func (c * clusterClient ) _pickMulti (multi []Completed ) (retries * connretry , last uint16 , toReplica bool ) {
530
- last = cmds .InitSlot
529
+ func (c * clusterClient ) _pickMulti (multi []Completed ) (retries * connretry ) {
530
+ last : = cmds .InitSlot
531
531
init := false
532
532
533
533
for _ , cmd := range multi {
@@ -551,7 +551,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
551
551
p = c .pslots [cmd .Slot ()]
552
552
}
553
553
if p == nil {
554
- return nil , 0 , false
554
+ return nil
555
555
}
556
556
count .m [p ]++
557
557
}
@@ -563,11 +563,8 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
563
563
conncountp .Put (count )
564
564
565
565
for i , cmd := range multi {
566
- last = cmd .Slot ()
567
-
568
566
var cc conn
569
567
if c .opt .SendToReplicas (cmd ) {
570
- toReplica = true
571
568
cc = c .rslots [cmd .Slot ()]
572
569
} else {
573
570
cc = c .pslots [cmd .Slot ()]
@@ -577,7 +574,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
577
574
re .commands = append (re .commands , cmd )
578
575
re .cIndexes = append (re .cIndexes , i )
579
576
}
580
- return retries , last , toReplica
577
+ return retries
581
578
}
582
579
583
580
inits := 0
@@ -593,7 +590,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
593
590
}
594
591
p := c .pslots [cmd .Slot ()]
595
592
if p == nil {
596
- return nil , 0 , false
593
+ return nil
597
594
}
598
595
count .m [p ]++
599
596
}
@@ -608,7 +605,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
608
605
}
609
606
}
610
607
if last == cmds .InitSlot {
611
- return nil , 0 , false
608
+ return nil
612
609
}
613
610
}
614
611
@@ -629,20 +626,20 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
629
626
re .commands = append (re .commands , cmd )
630
627
re .cIndexes = append (re .cIndexes , i )
631
628
}
632
- return retries , last , false
629
+ return retries
633
630
}
634
631
635
- func (c * clusterClient ) pickMulti (ctx context.Context , multi []Completed ) (* connretry , uint16 , bool , error ) {
636
- conns , slot , toReplica := c ._pickMulti (multi )
632
+ func (c * clusterClient ) pickMulti (ctx context.Context , multi []Completed ) (* connretry , error ) {
633
+ conns := c ._pickMulti (multi )
637
634
if conns == nil {
638
635
if err := c .refresh (ctx ); err != nil {
639
- return nil , 0 , false , err
636
+ return nil , err
640
637
}
641
- if conns , slot , toReplica = c ._pickMulti (multi ); conns == nil {
642
- return nil , 0 , false , ErrNoSlot
638
+ if conns = c ._pickMulti (multi ); conns == nil {
639
+ return nil , ErrNoSlot
643
640
}
644
641
}
645
- return conns , slot , toReplica , nil
642
+ return conns , nil
646
643
}
647
644
648
645
func (c * clusterClient ) doresultfn (
@@ -713,7 +710,7 @@ func (c *clusterClient) DoMulti(ctx context.Context, multi ...Completed) []Redis
713
710
return nil
714
711
}
715
712
716
- retries , _ , _ , err := c .pickMulti (ctx , multi )
713
+ retries , err := c .pickMulti (ctx , multi )
717
714
if err != nil {
718
715
return fillErrs (len (multi ), err )
719
716
}
0 commit comments