From bbcb2b79882052692c5ad23279b45e485cd679a4 Mon Sep 17 00:00:00 2001
From: Tianyi Lin <linty@meitu.com>
Date: Mon, 23 Jul 2018 19:12:20 +0800
Subject: [PATCH] Supports new style syntax of client kill command

---
 commands.go      | 15 +++++++++++++++
 commands_test.go |  6 ++++++
 2 files changed, 21 insertions(+)

diff --git a/commands.go b/commands.go
index 763c837..dddf8ac 100644
--- a/commands.go
+++ b/commands.go
@@ -220,6 +220,7 @@ type Cmdable interface {
 	BgRewriteAOF() *StatusCmd
 	BgSave() *StatusCmd
 	ClientKill(ipPort string) *StatusCmd
+	ClientKillByFilter(keys ...string) *IntCmd
 	ClientList() *StringCmd
 	ClientPause(dur time.Duration) *BoolCmd
 	ConfigGet(parameter string) *SliceCmd
@@ -1822,6 +1823,20 @@ func (c *cmdable) ClientKill(ipPort string) *StatusCmd {
 	return cmd
 }
 
+// ClientKillByFilter is new style synx, while the ClientKill is old
+// CLIENT KILL <option> [value] ... <option> [value]
+func (c *cmdable) ClientKillByFilter(keys ...string) *IntCmd {
+	args := make([]interface{}, 2+len(keys))
+	args[0] = "client"
+	args[1] = "kill"
+	for i, key := range keys {
+		args[2+i] = key
+	}
+	cmd := NewIntCmd(args...)
+	c.process(cmd)
+	return cmd
+}
+
 func (c *cmdable) ClientList() *StringCmd {
 	cmd := NewStringCmd("client", "list")
 	c.process(cmd)
diff --git a/commands_test.go b/commands_test.go
index 6bec811..b29b4f7 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -115,6 +115,12 @@ var _ = Describe("Commands", func() {
 			Expect(r.Val()).To(Equal(""))
 		})
 
+		It("should ClientKillByFilter", func() {
+			r := client.ClientKillByFilter("TYPE", "test")
+			Expect(r.Err()).To(MatchError("ERR Unknown client type 'test'"))
+			Expect(r.Val()).To(Equal(int64(0)))
+		})
+
 		It("should ClientPause", func() {
 			err := client.ClientPause(time.Second).Err()
 			Expect(err).NotTo(HaveOccurred())