re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded formatting.

This commit is contained in:
Vladimir Mihailenco 2015-10-07 18:21:18 +03:00
parent 4419b753c1
commit 0944d0167b
1 changed files with 58 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
commands.go
View File

@ -84,7 +84,7 @@ func (c *commandable) Quit() *StatusCmd {
} }
func (c *commandable) Select(index int64) *StatusCmd { func (c *commandable) Select(index int64) *StatusCmd {
cmd := newKeylessStatusCmd("SELECT", formatInt(index)) cmd := newKeylessStatusCmd("SELECT", index)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -121,7 +121,7 @@ func (c *commandable) Expire(key string, expiration time.Duration) *BoolCmd {
} }
func (c *commandable) ExpireAt(key string, tm time.Time) *BoolCmd { func (c *commandable) ExpireAt(key string, tm time.Time) *BoolCmd {
cmd := NewBoolCmd("EXPIREAT", key, formatInt(tm.Unix())) cmd := NewBoolCmd("EXPIREAT", key, tm.Unix())
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -138,7 +138,7 @@ func (c *commandable) Migrate(host, port, key string, db int64, timeout time.Dur
host, host,
port, port,
key, key,
formatInt(db), db,
formatMs(timeout), formatMs(timeout),
) )
cmd._clusterKeyPos = 3 cmd._clusterKeyPos = 3
@ -148,7 +148,7 @@ func (c *commandable) Migrate(host, port, key string, db int64, timeout time.Dur
} }
func (c *commandable) Move(key string, db int64) *BoolCmd { func (c *commandable) Move(key string, db int64) *BoolCmd {
cmd := NewBoolCmd("MOVE", key, formatInt(db)) cmd := NewBoolCmd("MOVE", key, db)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -208,7 +208,7 @@ func (c *commandable) PExpireAt(key string, tm time.Time) *BoolCmd {
cmd := NewBoolCmd( cmd := NewBoolCmd(
"PEXPIREAT", "PEXPIREAT",
key, key,
formatInt(tm.UnixNano()/int64(time.Millisecond)), tm.UnixNano()/int64(time.Millisecond),
) )
c.Process(cmd) c.Process(cmd)
return cmd return cmd
@ -276,7 +276,7 @@ func (c *commandable) Sort(key string, sort Sort) *StringSliceCmd {
args = append(args, "BY", sort.By) args = append(args, "BY", sort.By)
} }
if sort.Offset != 0 || sort.Count != 0 { if sort.Offset != 0 || sort.Count != 0 {
args = append(args, "LIMIT", formatFloat(sort.Offset), formatFloat(sort.Count)) args = append(args, "LIMIT", sort.Offset, sort.Count)
} }
for _, get := range sort.Get { for _, get := range sort.Get {
args = append(args, "GET", get) args = append(args, "GET", get)
@ -308,12 +308,12 @@ func (c *commandable) Type(key string) *StatusCmd {
} }
func (c *commandable) Scan(cursor int64, match string, count int64) *ScanCmd { func (c *commandable) Scan(cursor int64, match string, count int64) *ScanCmd {
args := []interface{}{"SCAN", formatInt(cursor)} args := []interface{}{"SCAN", cursor}
if match != "" { if match != "" {
args = append(args, "MATCH", match) args = append(args, "MATCH", match)
} }
if count > 0 { if count > 0 {
args = append(args, "COUNT", formatInt(count)) args = append(args, "COUNT", count)
} }
cmd := NewScanCmd(args...) cmd := NewScanCmd(args...)
c.Process(cmd) c.Process(cmd)
@ -321,12 +321,12 @@ func (c *commandable) Scan(cursor int64, match string, count int64) *ScanCmd {
} }
func (c *commandable) SScan(key string, cursor int64, match string, count int64) *ScanCmd { func (c *commandable) SScan(key string, cursor int64, match string, count int64) *ScanCmd {
args := []interface{}{"SSCAN", key, formatInt(cursor)} args := []interface{}{"SSCAN", key, cursor}
if match != "" { if match != "" {
args = append(args, "MATCH", match) args = append(args, "MATCH", match)
} }
if count > 0 { if count > 0 {
args = append(args, "COUNT", formatInt(count)) args = append(args, "COUNT", count)
} }
cmd := NewScanCmd(args...) cmd := NewScanCmd(args...)
c.Process(cmd) c.Process(cmd)
@ -334,12 +334,12 @@ func (c *commandable) SScan(key string, cursor int64, match string, count int64)
} }
func (c *commandable) HScan(key string, cursor int64, match string, count int64) *ScanCmd { func (c *commandable) HScan(key string, cursor int64, match string, count int64) *ScanCmd {
args := []interface{}{"HSCAN", key, formatInt(cursor)} args := []interface{}{"HSCAN", key, cursor}
if match != "" { if match != "" {
args = append(args, "MATCH", match) args = append(args, "MATCH", match)
} }
if count > 0 { if count > 0 {
args = append(args, "COUNT", formatInt(count)) args = append(args, "COUNT", count)
} }
cmd := NewScanCmd(args...) cmd := NewScanCmd(args...)
c.Process(cmd) c.Process(cmd)
@ -347,12 +347,12 @@ func (c *commandable) HScan(key string, cursor int64, match string, count int64)
} }
func (c *commandable) ZScan(key string, cursor int64, match string, count int64) *ScanCmd { func (c *commandable) ZScan(key string, cursor int64, match string, count int64) *ScanCmd {
args := []interface{}{"ZSCAN", key, formatInt(cursor)} args := []interface{}{"ZSCAN", key, cursor}
if match != "" { if match != "" {
args = append(args, "MATCH", match) args = append(args, "MATCH", match)
} }
if count > 0 { if count > 0 {
args = append(args, "COUNT", formatInt(count)) args = append(args, "COUNT", count)
} }
cmd := NewScanCmd(args...) cmd := NewScanCmd(args...)
c.Process(cmd) c.Process(cmd)
@ -376,8 +376,8 @@ func (c *commandable) BitCount(key string, bitCount *BitCount) *IntCmd {
if bitCount != nil { if bitCount != nil {
args = append( args = append(
args, args,
formatInt(bitCount.Start), bitCount.Start,
formatInt(bitCount.End), bitCount.End,
) )
} }
cmd := NewIntCmd(args...) cmd := NewIntCmd(args...)
@ -418,14 +418,14 @@ func (c *commandable) BitPos(key string, bit int64, pos ...int64) *IntCmd {
args := make([]interface{}, 3+len(pos)) args := make([]interface{}, 3+len(pos))
args[0] = "BITPOS" args[0] = "BITPOS"
args[1] = key args[1] = key
args[2] = formatInt(bit) args[2] = bit
switch len(pos) { switch len(pos) {
case 0: case 0:
case 1: case 1:
args[3] = formatInt(pos[0]) args[3] = pos[0]
case 2: case 2:
args[3] = formatInt(pos[0]) args[3] = pos[0]
args[4] = formatInt(pos[1]) args[4] = pos[1]
default: default:
panic("too many arguments") panic("too many arguments")
} }
@ -441,7 +441,7 @@ func (c *commandable) Decr(key string) *IntCmd {
} }
func (c *commandable) DecrBy(key string, decrement int64) *IntCmd { func (c *commandable) DecrBy(key string, decrement int64) *IntCmd {
cmd := NewIntCmd("DECRBY", key, formatInt(decrement)) cmd := NewIntCmd("DECRBY", key, decrement)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -453,18 +453,13 @@ func (c *commandable) Get(key string) *StringCmd {
} }
func (c *commandable) GetBit(key string, offset int64) *IntCmd { func (c *commandable) GetBit(key string, offset int64) *IntCmd {
cmd := NewIntCmd("GETBIT", key, formatInt(offset)) cmd := NewIntCmd("GETBIT", key, offset)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) GetRange(key string, start, end int64) *StringCmd { func (c *commandable) GetRange(key string, start, end int64) *StringCmd {
cmd := NewStringCmd( cmd := NewStringCmd("GETRANGE", key, start, end)
"GETRANGE",
key,
formatInt(start),
formatInt(end),
)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -482,13 +477,13 @@ func (c *commandable) Incr(key string) *IntCmd {
} }
func (c *commandable) IncrBy(key string, value int64) *IntCmd { func (c *commandable) IncrBy(key string, value int64) *IntCmd {
cmd := NewIntCmd("INCRBY", key, formatInt(value)) cmd := NewIntCmd("INCRBY", key, value)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) IncrByFloat(key string, value float64) *FloatCmd { func (c *commandable) IncrByFloat(key string, value float64) *FloatCmd {
cmd := NewFloatCmd("INCRBYFLOAT", key, formatFloat(value)) cmd := NewFloatCmd("INCRBYFLOAT", key, value)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -550,8 +545,8 @@ func (c *commandable) SetBit(key string, offset int64, value int) *IntCmd {
cmd := NewIntCmd( cmd := NewIntCmd(
"SETBIT", "SETBIT",
key, key,
formatInt(offset), offset,
formatInt(int64(value)), value,
) )
c.Process(cmd) c.Process(cmd)
return cmd return cmd
@ -591,7 +586,7 @@ func (c *Client) SetXX(key string, value interface{}, expiration time.Duration)
} }
func (c *commandable) SetRange(key string, offset int64, value string) *IntCmd { func (c *commandable) SetRange(key string, offset int64, value string) *IntCmd {
cmd := NewIntCmd("SETRANGE", key, formatInt(offset), value) cmd := NewIntCmd("SETRANGE", key, offset, value)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -641,13 +636,13 @@ func (c *commandable) HGetAllMap(key string) *StringStringMapCmd {
} }
func (c *commandable) HIncrBy(key, field string, incr int64) *IntCmd { func (c *commandable) HIncrBy(key, field string, incr int64) *IntCmd {
cmd := NewIntCmd("HINCRBY", key, field, formatInt(incr)) cmd := NewIntCmd("HINCRBY", key, field, incr)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) HIncrByFloat(key, field string, incr float64) *FloatCmd { func (c *commandable) HIncrByFloat(key, field string, incr float64) *FloatCmd {
cmd := NewFloatCmd("HINCRBYFLOAT", key, field, formatFloat(incr)) cmd := NewFloatCmd("HINCRBYFLOAT", key, field, incr)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -749,7 +744,7 @@ func (c *commandable) BRPopLPush(source, destination string, timeout time.Durati
} }
func (c *commandable) LIndex(key string, index int64) *StringCmd { func (c *commandable) LIndex(key string, index int64) *StringCmd {
cmd := NewStringCmd("LINDEX", key, formatInt(index)) cmd := NewStringCmd("LINDEX", key, index)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -794,21 +789,21 @@ func (c *commandable) LRange(key string, start, stop int64) *StringSliceCmd {
cmd := NewStringSliceCmd( cmd := NewStringSliceCmd(
"LRANGE", "LRANGE",
key, key,
formatInt(start), start,
formatInt(stop), stop,
) )
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) LRem(key string, count int64, value string) *IntCmd { func (c *commandable) LRem(key string, count int64, value string) *IntCmd {
cmd := NewIntCmd("LREM", key, formatInt(count), value) cmd := NewIntCmd("LREM", key, count, value)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) LSet(key string, index int64, value string) *StatusCmd { func (c *commandable) LSet(key string, index int64, value string) *StatusCmd {
cmd := NewStatusCmd("LSET", key, formatInt(index), value) cmd := NewStatusCmd("LSET", key, index, value)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -817,8 +812,8 @@ func (c *commandable) LTrim(key string, start, stop int64) *StatusCmd {
cmd := NewStatusCmd( cmd := NewStatusCmd(
"LTRIM", "LTRIM",
key, key,
formatInt(start), start,
formatInt(stop), stop,
) )
c.Process(cmd) c.Process(cmd)
return cmd return cmd
@ -953,7 +948,7 @@ func (c *commandable) SRandMember(key string) *StringCmd {
// Redis `SRANDMEMBER key count` command. // Redis `SRANDMEMBER key count` command.
func (c *commandable) SRandMemberN(key string, count int64) *StringSliceCmd { func (c *commandable) SRandMemberN(key string, count int64) *StringSliceCmd {
cmd := NewStringSliceCmd("SRANDMEMBER", key, formatInt(count)) cmd := NewStringSliceCmd("SRANDMEMBER", key, count)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -1010,7 +1005,7 @@ type ZStore struct {
func (c *commandable) zAdd(a []interface{}, n int, members ...Z) *IntCmd { func (c *commandable) zAdd(a []interface{}, n int, members ...Z) *IntCmd {
for i, m := range members { for i, m := range members {
a[n+2*i] = formatFloat(m.Score) a[n+2*i] = m.Score
a[n+2*i+1] = m.Member a[n+2*i+1] = m.Member
} }
cmd := NewIntCmd(a...) cmd := NewIntCmd(a...)
@ -1068,7 +1063,7 @@ func (c *commandable) ZAddXXCh(key string, members ...Z) *IntCmd {
func (c *commandable) zIncr(a []interface{}, n int, members ...Z) *FloatCmd { func (c *commandable) zIncr(a []interface{}, n int, members ...Z) *FloatCmd {
for i, m := range members { for i, m := range members {
a[n+2*i] = formatFloat(m.Score) a[n+2*i] = m.Score
a[n+2*i+1] = m.Member a[n+2*i+1] = m.Member
} }
cmd := NewFloatCmd(a...) cmd := NewFloatCmd(a...)
@ -1113,7 +1108,7 @@ func (c *commandable) ZCount(key, min, max string) *IntCmd {
} }
func (c *commandable) ZIncrBy(key string, increment float64, member string) *FloatCmd { func (c *commandable) ZIncrBy(key string, increment float64, member string) *FloatCmd {
cmd := NewFloatCmd("ZINCRBY", key, formatFloat(increment), member) cmd := NewFloatCmd("ZINCRBY", key, increment, member)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -1133,7 +1128,7 @@ func (c *commandable) ZInterStore(
if len(store.Weights) > 0 { if len(store.Weights) > 0 {
args = append(args, "WEIGHTS") args = append(args, "WEIGHTS")
for _, weight := range store.Weights { for _, weight := range store.Weights {
args = append(args, formatInt(weight)) args = append(args, weight)
} }
} }
if store.Aggregate != "" { if store.Aggregate != "" {
@ -1148,8 +1143,8 @@ func (c *commandable) zRange(key string, start, stop int64, withScores bool) *St
args := []interface{}{ args := []interface{}{
"ZRANGE", "ZRANGE",
key, key,
formatInt(start), start,
formatInt(stop), stop,
} }
if withScores { if withScores {
args = append(args, "WITHSCORES") args = append(args, "WITHSCORES")
@ -1164,14 +1159,7 @@ func (c *commandable) ZRange(key string, start, stop int64) *StringSliceCmd {
} }
func (c *commandable) ZRangeWithScores(key string, start, stop int64) *ZSliceCmd { func (c *commandable) ZRangeWithScores(key string, start, stop int64) *ZSliceCmd {
args := []interface{}{ cmd := NewZSliceCmd("ZRANGE", key, start, stop, "WITHSCORES")
"ZRANGE",
key,
formatInt(start),
formatInt(stop),
"WITHSCORES",
}
cmd := NewZSliceCmd(args...)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -1191,8 +1179,8 @@ func (c *commandable) zRangeBy(zcmd, key string, opt ZRangeByScore, withScores b
args = append( args = append(
args, args,
"LIMIT", "LIMIT",
formatInt(opt.Offset), opt.Offset,
formatInt(opt.Count), opt.Count,
) )
} }
cmd := NewStringSliceCmd(args...) cmd := NewStringSliceCmd(args...)
@ -1214,8 +1202,8 @@ func (c *commandable) ZRangeByScoreWithScores(key string, opt ZRangeByScore) *ZS
args = append( args = append(
args, args,
"LIMIT", "LIMIT",
formatInt(opt.Offset), opt.Offset,
formatInt(opt.Count), opt.Count,
) )
} }
cmd := NewZSliceCmd(args...) cmd := NewZSliceCmd(args...)
@ -1245,8 +1233,8 @@ func (c *commandable) ZRemRangeByRank(key string, start, stop int64) *IntCmd {
cmd := NewIntCmd( cmd := NewIntCmd(
"ZREMRANGEBYRANK", "ZREMRANGEBYRANK",
key, key,
formatInt(start), start,
formatInt(stop), stop,
) )
c.Process(cmd) c.Process(cmd)
return cmd return cmd
@ -1259,13 +1247,13 @@ func (c *commandable) ZRemRangeByScore(key, min, max string) *IntCmd {
} }
func (c *commandable) ZRevRange(key string, start, stop int64) *StringSliceCmd { func (c *commandable) ZRevRange(key string, start, stop int64) *StringSliceCmd {
cmd := NewStringSliceCmd("ZREVRANGE", key, formatInt(start), formatInt(stop)) cmd := NewStringSliceCmd("ZREVRANGE", key, start, stop)
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
func (c *commandable) ZRevRangeWithScores(key string, start, stop int64) *ZSliceCmd { func (c *commandable) ZRevRangeWithScores(key string, start, stop int64) *ZSliceCmd {
cmd := NewZSliceCmd("ZREVRANGE", key, formatInt(start), formatInt(stop), "WITHSCORES") cmd := NewZSliceCmd("ZREVRANGE", key, start, stop, "WITHSCORES")
c.Process(cmd) c.Process(cmd)
return cmd return cmd
} }
@ -1276,8 +1264,8 @@ func (c *commandable) zRevRangeBy(zcmd, key string, opt ZRangeByScore) *StringSl
args = append( args = append(
args, args,
"LIMIT", "LIMIT",
formatInt(opt.Offset), opt.Offset,
formatInt(opt.Count), opt.Count,
) )
} }
cmd := NewStringSliceCmd(args...) cmd := NewStringSliceCmd(args...)
@ -1299,8 +1287,8 @@ func (c *commandable) ZRevRangeByScoreWithScores(key string, opt ZRangeByScore)
args = append( args = append(
args, args,
"LIMIT", "LIMIT",
formatInt(opt.Offset), opt.Offset,
formatInt(opt.Count), opt.Count,
) )
} }
cmd := NewZSliceCmd(args...) cmd := NewZSliceCmd(args...)
@ -1331,7 +1319,7 @@ func (c *commandable) ZUnionStore(dest string, store ZStore, keys ...string) *In
if len(store.Weights) > 0 { if len(store.Weights) > 0 {
args = append(args, "WEIGHTS") args = append(args, "WEIGHTS")
for _, weight := range store.Weights { for _, weight := range store.Weights {
args = append(args, formatInt(weight)) args = append(args, weight)
} }
} }
if store.Aggregate != "" { if store.Aggregate != "" {