Skip to content

Commit 7e284ae

Browse files
authored
refactor: clean up unused return values (#698)
* refactor: clean up remove unused return value * refactor: remove last slot too * style: remove unused var
1 parent 29524d2 commit 7e284ae

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

cluster.go

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ func (c *clusterClient) toReplica(cmd Completed) bool {
526526
return false
527527
}
528528

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
531531
init := false
532532

533533
for _, cmd := range multi {
@@ -551,7 +551,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
551551
p = c.pslots[cmd.Slot()]
552552
}
553553
if p == nil {
554-
return nil, 0, false
554+
return nil
555555
}
556556
count.m[p]++
557557
}
@@ -563,11 +563,8 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
563563
conncountp.Put(count)
564564

565565
for i, cmd := range multi {
566-
last = cmd.Slot()
567-
568566
var cc conn
569567
if c.opt.SendToReplicas(cmd) {
570-
toReplica = true
571568
cc = c.rslots[cmd.Slot()]
572569
} else {
573570
cc = c.pslots[cmd.Slot()]
@@ -577,7 +574,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
577574
re.commands = append(re.commands, cmd)
578575
re.cIndexes = append(re.cIndexes, i)
579576
}
580-
return retries, last, toReplica
577+
return retries
581578
}
582579

583580
inits := 0
@@ -593,7 +590,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
593590
}
594591
p := c.pslots[cmd.Slot()]
595592
if p == nil {
596-
return nil, 0, false
593+
return nil
597594
}
598595
count.m[p]++
599596
}
@@ -608,7 +605,7 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
608605
}
609606
}
610607
if last == cmds.InitSlot {
611-
return nil, 0, false
608+
return nil
612609
}
613610
}
614611

@@ -629,20 +626,20 @@ func (c *clusterClient) _pickMulti(multi []Completed) (retries *connretry, last
629626
re.commands = append(re.commands, cmd)
630627
re.cIndexes = append(re.cIndexes, i)
631628
}
632-
return retries, last, false
629+
return retries
633630
}
634631

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)
637634
if conns == nil {
638635
if err := c.refresh(ctx); err != nil {
639-
return nil, 0, false, err
636+
return nil, err
640637
}
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
643640
}
644641
}
645-
return conns, slot, toReplica, nil
642+
return conns, nil
646643
}
647644

648645
func (c *clusterClient) doresultfn(
@@ -713,7 +710,7 @@ func (c *clusterClient) DoMulti(ctx context.Context, multi ...Completed) []Redis
713710
return nil
714711
}
715712

716-
retries, _, _, err := c.pickMulti(ctx, multi)
713+
retries, err := c.pickMulti(ctx, multi)
717714
if err != nil {
718715
return fillErrs(len(multi), err)
719716
}

0 commit comments

Comments
 (0)