mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from go-redis/fix/time-duration-timeout 

Use time.Duration to specify timeout.
This commit is contained in:
Vladimir Mihailenco 2015-04-13 10:04:28 +03:00
parent 053939b6e8 fb7803ad5a
commit 9de2369192
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
commands.go
View File

@ -2,6 +2,7 @@ package redis
import ( import (
"io" "io"
"log"
"strconv" "strconv"
"time" "time"
) )
@ -14,11 +15,11 @@ func formatInt(i int64) string {
return strconv.FormatInt(i, 10) return strconv.FormatInt(i, 10)
} }
func readTimeout(sec int64) time.Duration { func readTimeout(timeout time.Duration) time.Duration {
if sec == 0 { if timeout == 0 {
return 0 return 0
} }
return time.Duration(sec+1) * time.Second return timeout + time.Second
} }
type commandable struct { type commandable struct {
@ -34,10 +35,22 @@ func usePrecise(dur time.Duration) bool {
} }
func formatMs(dur time.Duration) string { func formatMs(dur time.Duration) string {
if dur > 0 && dur < time.Millisecond {
log.Printf(
"redis: specified duration is %s, but minimal supported value is %s",
dur, time.Millisecond,
)
}
return strconv.FormatInt(int64(dur/time.Millisecond), 10) return strconv.FormatInt(int64(dur/time.Millisecond), 10)
} }
func formatSec(dur time.Duration) string { func formatSec(dur time.Duration) string {
if dur > 0 && dur < time.Second {
log.Printf(
"redis: specified duration is %s, but minimal supported value is %s",
dur, time.Second,
)
}
return strconv.FormatInt(int64(dur/time.Second), 10) return strconv.FormatInt(int64(dur/time.Second), 10)
} }
@ -111,14 +124,14 @@ func (c *commandable) Keys(pattern string) *StringSliceCmd {
return cmd return cmd
} }
func (c *commandable) Migrate(host, port, key string, db, timeout int64) *StatusCmd { func (c *commandable) Migrate(host, port, key string, db int64, timeout time.Duration) *StatusCmd {
cmd := NewStatusCmd( cmd := NewStatusCmd(
"MIGRATE", "MIGRATE",
host, host,
port, port,
key, key,
strconv.FormatInt(db, 10), strconv.FormatInt(db, 10),
strconv.FormatInt(timeout, 10), formatMs(timeout),
) )
cmd._clusterKeyPos = 3 cmd._clusterKeyPos = 3
cmd.setReadTimeout(readTimeout(timeout)) cmd.setReadTimeout(readTimeout(timeout))
@ -624,30 +637,30 @@ func (c *commandable) HVals(key string) *StringSliceCmd {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
func (c *commandable) BLPop(timeout int64, keys ...string) *StringSliceCmd { func (c *commandable) BLPop(timeout time.Duration, keys ...string) *StringSliceCmd {
args := append([]string{"BLPOP"}, keys...) args := append([]string{"BLPOP"}, keys...)
args = append(args, strconv.FormatInt(timeout, 10)) args = append(args, formatSec(timeout))
cmd := NewStringSliceCmd(args...) cmd := NewStringSliceCmd(args...)
cmd.setReadTimeout(readTimeout(timeout)) cmd.setReadTimeout(readTimeout(timeout))
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) BRPop(timeout int64, keys ...string) *StringSliceCmd { func (c *commandable) BRPop(timeout time.Duration, keys ...string) *StringSliceCmd {
args := append([]string{"BRPOP"}, keys...) args := append([]string{"BRPOP"}, keys...)
args = append(args, strconv.FormatInt(timeout, 10)) args = append(args, formatSec(timeout))
cmd := NewStringSliceCmd(args...) cmd := NewStringSliceCmd(args...)
cmd.setReadTimeout(readTimeout(timeout)) cmd.setReadTimeout(readTimeout(timeout))
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) BRPopLPush(source, destination string, timeout int64) *StringCmd { func (c *commandable) BRPopLPush(source, destination string, timeout time.Duration) *StringCmd {
cmd := NewStringCmd( cmd := NewStringCmd(
"BRPOPLPUSH", "BRPOPLPUSH",
source, source,
destination, destination,
strconv.FormatInt(timeout, 10), formatSec(timeout),
) )
cmd.setReadTimeout(readTimeout(timeout)) cmd.setReadTimeout(readTimeout(timeout))
c.Process(cmd) c.Process(cmd)

4
commands_test.go
View File

@ -1231,7 +1231,7 @@ var _ = Describe("Commands", func() {
}) })
It("should BLPop timeout", func() { It("should BLPop timeout", func() {
bLPop := client.BLPop(1, "list1") bLPop := client.BLPop(time.Second, "list1")
Expect(bLPop.Val()).To(BeNil()) Expect(bLPop.Val()).To(BeNil())
Expect(bLPop.Err()).To(Equal(redis.Nil)) Expect(bLPop.Err()).To(Equal(redis.Nil))
}) })
@ -1245,7 +1245,7 @@ var _ = Describe("Commands", func() {
Expect(bRPop.Val()).To(Equal([]string{"list1", "c"})) Expect(bRPop.Val()).To(Equal([]string{"list1", "c"}))
}) })
It("should BRPopBlocks", func() { It("should BRPop blocks", func() {
started := make(chan bool) started := make(chan bool)
done := make(chan bool) done := make(chan bool)
go func() { go func() {