diff --git a/osscluster.go b/osscluster.go index 6c6b7563..a68f7eab 100644 --- a/osscluster.go +++ b/osscluster.go @@ -979,13 +979,6 @@ func (c *ClusterClient) Close() error { return c.nodes.Close() } -// Do create a Cmd from the args and processes the cmd. -func (c *ClusterClient) Do(ctx context.Context, args ...interface{}) *Cmd { - cmd := NewCmd(ctx, args...) - _ = c.Process(ctx, cmd) - return cmd -} - func (c *ClusterClient) Process(ctx context.Context, cmd Cmder) error { err := c.processHook(ctx, cmd) cmd.SetErr(err) diff --git a/osscluster_test.go b/osscluster_test.go index 6e214a71..99341183 100644 --- a/osscluster_test.go +++ b/osscluster_test.go @@ -264,6 +264,12 @@ var _ = Describe("ClusterClient", func() { var client *redis.ClusterClient assertClusterClient := func() { + It("do", func() { + val, err := client.Do(ctx, "ping").Result() + Expect(err).NotTo(HaveOccurred()) + Expect(val).To(Equal("PONG")) + }) + It("should GET/SET/DEL", func() { err := client.Get(ctx, "A").Err() Expect(err).To(Equal(redis.Nil)) diff --git a/redis.go b/redis.go index bafe82f7..a368623a 100644 --- a/redis.go +++ b/redis.go @@ -776,13 +776,6 @@ func (c *Client) Conn() *Conn { return newConn(c.opt, pool.NewStickyConnPool(c.connPool), &c.hooksMixin) } -// Do create a Cmd from the args and processes the cmd. -func (c *Client) Do(ctx context.Context, args ...interface{}) *Cmd { - cmd := NewCmd(ctx, args...) - _ = c.Process(ctx, cmd) - return cmd -} - func (c *Client) Process(ctx context.Context, cmd Cmder) error { err := c.processHook(ctx, cmd) cmd.SetErr(err) diff --git a/redis_test.go b/redis_test.go index dd14214f..6aaa0a75 100644 --- a/redis_test.go +++ b/redis_test.go @@ -89,6 +89,12 @@ var _ = Describe("Client", func() { Expect(err).NotTo(HaveOccurred()) }) + It("do", func() { + val, err := client.Do(ctx, "ping").Result() + Expect(err).NotTo(HaveOccurred()) + Expect(val).To(Equal("PONG")) + }) + It("should ping", func() { val, err := client.Ping(ctx).Result() Expect(err).NotTo(HaveOccurred()) diff --git a/ring.go b/ring.go index 4da0b21a..1f75913a 100644 --- a/ring.go +++ b/ring.go @@ -563,13 +563,6 @@ func (c *Ring) SetAddrs(addrs map[string]string) { c.sharding.SetAddrs(addrs) } -// Do create a Cmd from the args and processes the cmd. -func (c *Ring) Do(ctx context.Context, args ...interface{}) *Cmd { - cmd := NewCmd(ctx, args...) - _ = c.Process(ctx, cmd) - return cmd -} - func (c *Ring) Process(ctx context.Context, cmd Cmder) error { err := c.processHook(ctx, cmd) cmd.SetErr(err) diff --git a/ring_test.go b/ring_test.go index aaac74dc..ef95e980 100644 --- a/ring_test.go +++ b/ring_test.go @@ -74,6 +74,12 @@ var _ = Describe("Redis Ring", func() { Expect(ring.Close()).NotTo(HaveOccurred()) }) + It("do", func() { + val, err := ring.Do(ctx, "ping").Result() + Expect(err).NotTo(HaveOccurred()) + Expect(val).To(Equal("PONG")) + }) + It("supports context", func() { ctx, cancel := context.WithCancel(ctx) cancel()