forked from mirror/redis
fix: wrap cmds in Conn.TxPipeline
This commit is contained in:
parent
0884e48a21
commit
5053db2f9c
15
redis.go
15
redis.go
|
@ -725,21 +725,13 @@ func (c *Conn) Process(ctx context.Context, cmd Cmder) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Conn) processPipeline(ctx context.Context, cmds []Cmder) error {
|
|
||||||
return c.hooks.processPipeline(ctx, cmds)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) processTxPipeline(ctx context.Context, cmds []Cmder) error {
|
|
||||||
return c.hooks.processTxPipeline(ctx, cmds)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *Conn) Pipelined(ctx context.Context, fn func(Pipeliner) error) ([]Cmder, error) {
|
func (c *Conn) Pipelined(ctx context.Context, fn func(Pipeliner) error) ([]Cmder, error) {
|
||||||
return c.Pipeline().Pipelined(ctx, fn)
|
return c.Pipeline().Pipelined(ctx, fn)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Conn) Pipeline() Pipeliner {
|
func (c *Conn) Pipeline() Pipeliner {
|
||||||
pipe := Pipeline{
|
pipe := Pipeline{
|
||||||
exec: c.processPipeline,
|
exec: c.hooks.processPipeline,
|
||||||
}
|
}
|
||||||
pipe.init()
|
pipe.init()
|
||||||
return &pipe
|
return &pipe
|
||||||
|
@ -752,7 +744,10 @@ func (c *Conn) TxPipelined(ctx context.Context, fn func(Pipeliner) error) ([]Cmd
|
||||||
// TxPipeline acts like Pipeline, but wraps queued commands with MULTI/EXEC.
|
// TxPipeline acts like Pipeline, but wraps queued commands with MULTI/EXEC.
|
||||||
func (c *Conn) TxPipeline() Pipeliner {
|
func (c *Conn) TxPipeline() Pipeliner {
|
||||||
pipe := Pipeline{
|
pipe := Pipeline{
|
||||||
exec: c.processTxPipeline,
|
exec: func(ctx context.Context, cmds []Cmder) error {
|
||||||
|
cmds = wrapMultiExec(ctx, cmds)
|
||||||
|
return c.hooks.processTxPipeline(ctx, cmds)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
pipe.init()
|
pipe.init()
|
||||||
return &pipe
|
return &pipe
|
||||||
|
|
|
@ -446,3 +446,25 @@ var _ = Describe("Client context cancelation", func() {
|
||||||
Expect(err).To(BeIdenticalTo(context.Canceled))
|
Expect(err).To(BeIdenticalTo(context.Canceled))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
var _ = Describe("Conn", func() {
|
||||||
|
var client *redis.Client
|
||||||
|
|
||||||
|
BeforeEach(func() {
|
||||||
|
client = redis.NewClient(redisOptions())
|
||||||
|
Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
AfterEach(func() {
|
||||||
|
err := client.Close()
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
|
||||||
|
It("TxPipeline", func() {
|
||||||
|
tx := client.Conn().TxPipeline()
|
||||||
|
tx.SwapDB(ctx, 0, 2)
|
||||||
|
tx.SwapDB(ctx, 1, 0)
|
||||||
|
_, err := tx.Exec(ctx)
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
Loading…
Reference in New Issue