feat: send DISCARD command when conn recycled (#580)

* feat: send DISCARD command when conn recycled * feat: add tests * fix: add suggestion Co-authored-by: Rueian <[email protected]> * fix: DISCARD should reply a OK message instead of a push message. --------- Co-authored-by: Anuragkillswitch <[email protected]> Co-authored-by: Rueian <[email protected]>
redis · Jun 27, 2024 · 45cdf7e · 45cdf7e
1 parent a5b0dc5
commit 45cdf7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/internal/cmds/cmds.go b/internal/cmds/cmds.go
@@ -76,6 +76,11 @@ var (
 		cs: newCommandSlice([]string{"UNSUBSCRIBE", "+sentinel", "+slave", "-sdown", "+sdown", "+switch-master", "+reboot"}),
 		cf: noRetTag,
 	}
+
+	// DiscardCmd is predefined DISCARD
+	DiscardCmd = Completed{
+		cs: newCommandSlice([]string{"DISCARD"}),
+	}
 )
 
 // ToBlock marks the command with blockTag

diff --git a/pipe.go b/pipe.go
@@ -751,9 +751,9 @@ func (p *pipe) Receive(ctx context.Context, subscribe Completed, fn func(message
 func (p *pipe) CleanSubscriptions() {
 	if atomic.LoadInt32(&p.state) == 1 {
 		if p.version >= 7 {
-			p.DoMulti(context.Background(), cmds.UnsubscribeCmd, cmds.PUnsubscribeCmd, cmds.SUnsubscribeCmd)
+			p.DoMulti(context.Background(), cmds.UnsubscribeCmd, cmds.PUnsubscribeCmd, cmds.SUnsubscribeCmd, cmds.DiscardCmd)
 		} else {
-			p.DoMulti(context.Background(), cmds.UnsubscribeCmd, cmds.PUnsubscribeCmd)
+			p.DoMulti(context.Background(), cmds.UnsubscribeCmd, cmds.PUnsubscribeCmd, cmds.DiscardCmd)
 		}
 	}
 }

diff --git a/pipe_test.go b/pipe_test.go
@@ -4119,7 +4119,7 @@ func TestPipe_CleanSubscriptions_6(t *testing.T) {
 	go func() {
 		p.CleanSubscriptions()
 	}()
-	mock.Expect("UNSUBSCRIBE").Expect("PUNSUBSCRIBE").Reply(
+	mock.Expect("UNSUBSCRIBE").Expect("PUNSUBSCRIBE").Expect("DISCARD").Reply(
 		RedisMessage{typ: '>', values: []RedisMessage{
 			{typ: '+', string: "unsubscribe"},
 			{typ: '_'},
@@ -4129,7 +4129,9 @@ func TestPipe_CleanSubscriptions_6(t *testing.T) {
 			{typ: '+', string: "punsubscribe"},
 			{typ: '_'},
 			{typ: ':', integer: 2},
-		}})
+		}},
+		RedisMessage{typ: '+', string: "OK"},
+	)
 }
 
 func TestPipe_CleanSubscriptions_7(t *testing.T) {
@@ -4141,7 +4143,7 @@ func TestPipe_CleanSubscriptions_7(t *testing.T) {
 	go func() {
 		p.CleanSubscriptions()
 	}()
-	mock.Expect("UNSUBSCRIBE").Expect("PUNSUBSCRIBE").Expect("SUNSUBSCRIBE").Reply(
+	mock.Expect("UNSUBSCRIBE").Expect("PUNSUBSCRIBE").Expect("SUNSUBSCRIBE").Expect("DISCARD").Reply(
 		RedisMessage{typ: '>', values: []RedisMessage{
 			{typ: '+', string: "unsubscribe"},
 			{typ: '_'},
@@ -4155,8 +4157,10 @@ func TestPipe_CleanSubscriptions_7(t *testing.T) {
 		RedisMessage{typ: '>', values: []RedisMessage{
 			{typ: '+', string: "sunsubscribe"},
 			{typ: '_'},
-			{typ: ':', integer: 2},
-		}})
+			{typ: ':', integer: 3},
+		}},
+		RedisMessage{typ: '+', string: "OK"},
+	)
 }
 
 func TestPingOnConnError(t *testing.T) {