Fix multi/exec and add more commands.

This commit is contained in:
Vladimir Mihailenco 2012-07-26 18:16:17 +03:00
parent a74d9a5801
commit 153bd05fb7
4 changed files with 1653 additions and 199 deletions

View File

@ -6,12 +6,39 @@ import (
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
func (c *Client) Auth(password string) *StatusReq {
req := NewStatusReq("AUTH", password)
c.Run(req)
return req
}
func (c *Client) Echo(message string) *BulkReq {
req := NewBulkReq("ECHO", message)
c.Run(req)
return req
}
func (c *Client) Ping() *StatusReq { func (c *Client) Ping() *StatusReq {
req := NewStatusReq("PING") req := NewStatusReq("PING")
c.Run(req) c.Run(req)
return req return req
} }
func (c *Client) Quit() *StatusReq {
req := NewStatusReq("QUIT")
c.Run(req)
c.Close()
return req
}
func (c *Client) Select(index int64) *StatusReq {
req := NewStatusReq("SELECT", strconv.FormatInt(index, 10))
c.Run(req)
return req
}
//------------------------------------------------------------------------------
func (c *Client) Flushall() *StatusReq { func (c *Client) Flushall() *StatusReq {
req := NewStatusReq("FLUSHALL") req := NewStatusReq("FLUSHALL")
c.Run(req) c.Run(req)
@ -26,50 +53,590 @@ func (c *Client) Flushdb() *StatusReq {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
func (c *Client) Del(keys ...string) *IntReq {
args := append([]string{"DEL"}, keys...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) Dump(key string) *BulkReq {
req := NewBulkReq("DUMP", key)
c.Run(req)
return req
}
func (c *Client) Exists(key string) *BoolReq {
req := NewBoolReq("EXISTS", key)
c.Run(req)
return req
}
func (c *Client) Expire(key string, seconds int64) *BoolReq {
req := NewBoolReq("EXPIRE", key, strconv.FormatInt(seconds, 10))
c.Run(req)
return req
}
func (c *Client) ExpireAt(key string, timestamp int64) *BoolReq {
req := NewBoolReq("EXPIREAT", key, strconv.FormatInt(timestamp, 10))
c.Run(req)
return req
}
func (c *Client) Keys(pattern string) *MultiBulkReq {
req := NewMultiBulkReq("KEYS", pattern)
c.Run(req)
return req
}
func (c *Client) Migrate(host string, port int32, key, db string, timeout int64) *StatusReq {
req := NewStatusReq(
"MIGRATE",
host,
strconv.FormatInt(int64(port), 10),
key,
db,
strconv.FormatInt(timeout, 10),
)
c.Run(req)
return req
}
func (c *Client) Move(key string, db int64) *BoolReq {
req := NewBoolReq("MOVE", key, strconv.FormatInt(db, 10))
c.Run(req)
return req
}
func (c *Client) ObjectRefCount(keys ...string) *IntReq {
args := append([]string{"OBJECT", "REFCOUNT"}, keys...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) ObjectEncoding(keys ...string) *BulkReq {
args := append([]string{"OBJECT", "ENCODING"}, keys...)
req := NewBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) ObjectIdleTime(keys ...string) *IntReq {
args := append([]string{"OBJECT", "IDLETIME"}, keys...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) Persist(key string) *BoolReq {
req := NewBoolReq("PERSIST", key)
c.Run(req)
return req
}
func (c *Client) Pexpire(key string, milliseconds int64) *BoolReq {
req := NewBoolReq("PEXPIRE", key, strconv.FormatInt(milliseconds, 10))
c.Run(req)
return req
}
func (c *Client) PexpireAt(key string, milliseconds int64) *BoolReq {
req := NewBoolReq("PEXPIREAT", key, strconv.FormatInt(milliseconds, 10))
c.Run(req)
return req
}
func (c *Client) PTTL(key string) *IntReq {
req := NewIntReq("PTTL", key)
c.Run(req)
return req
}
func (c *Client) RandomKey() *BulkReq {
req := NewBulkReq("RANDOMKEY")
c.Run(req)
return req
}
func (c *Client) Rename(key, newkey string) *StatusReq {
req := NewStatusReq("RENAME", key, newkey)
c.Run(req)
return req
}
func (c *Client) RenameNX(key, newkey string) *BoolReq {
req := NewBoolReq("RENAMENX", key, newkey)
c.Run(req)
return req
}
func (c *Client) Restore(key, ttl int64, value string) *StatusReq {
req := NewStatusReq(
"RESTORE",
strconv.FormatInt(ttl, 10),
value,
)
c.Run(req)
return req
}
func (c *Client) Sort(key string, params ...string) *MultiBulkReq {
args := append([]string{"SORT", key}, params...)
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) TTL(key string) *IntReq {
req := NewIntReq("TTL", key)
c.Run(req)
return req
}
func (c *Client) Type(key string) *StatusReq {
req := NewStatusReq("TYPE", key)
c.Run(req)
return req
}
//------------------------------------------------------------------------------
func (c *Client) Append(key, value string) *IntReq {
req := NewIntReq("APPEND", key, value)
c.Run(req)
return req
}
// BitCount
// BitOp
func (c *Client) Decr(key string) *IntReq {
req := NewIntReq("DECR", key)
c.Run(req)
return req
}
func (c *Client) DecrBy(key string, decrement int64) *IntReq {
req := NewIntReq("DECRBY", key, strconv.FormatInt(decrement, 10))
c.Run(req)
return req
}
func (c *Client) Get(key string) *BulkReq { func (c *Client) Get(key string) *BulkReq {
req := NewBulkReq("GET", key) req := NewBulkReq("GET", key)
c.Run(req) c.Run(req)
return req return req
} }
func (c *Client) GetBit(key string, offset int64) *IntReq {
req := NewIntReq("GETBIT", key, strconv.FormatInt(offset, 10))
c.Run(req)
return req
}
func (c *Client) GetRange(key string, start, end int64) *BulkReq {
req := NewBulkReq(
"GETRANGE",
key,
strconv.FormatInt(start, 10),
strconv.FormatInt(end, 10),
)
c.Run(req)
return req
}
func (c *Client) GetSet(key, value string) *BulkReq {
req := NewBulkReq("GETSET", key, value)
c.Run(req)
return req
}
func (c *Client) Incr(key string) *IntReq {
req := NewIntReq("INCR", key)
c.Run(req)
return req
}
func (c *Client) IncrBy(key string, value int64) *IntReq {
req := NewIntReq("INCRBY", key, strconv.FormatInt(value, 10))
c.Run(req)
return req
}
// incrbyfloat
func (c *Client) MGet(keys ...string) *MultiBulkReq {
args := append([]string{"MGET"}, keys...)
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) MSet(pairs ...string) *StatusReq {
args := append([]string{"MSET"}, pairs...)
req := NewStatusReq(args...)
c.Run(req)
return req
}
func (c *Client) MSetNX(pairs ...string) *BoolReq {
args := append([]string{"MSETNX"}, pairs...)
req := NewBoolReq(args...)
c.Run(req)
return req
}
func (c *Client) PSetEx(key string, milliseconds int64, value string) *StatusReq {
req := NewStatusReq(
"PSETEX",
key,
strconv.FormatInt(milliseconds, 10),
value,
)
c.Run(req)
return req
}
func (c *Client) Set(key, value string) *StatusReq { func (c *Client) Set(key, value string) *StatusReq {
req := NewStatusReq("SET", key, value) req := NewStatusReq("SET", key, value)
c.Run(req) c.Run(req)
return req return req
} }
func (c *Client) Auth(password string) *StatusReq { func (c *Client) SetBit(key string, offset int64, value int) *IntReq {
req := NewStatusReq("AUTH", password) req := NewIntReq(
"SETBIT",
key,
strconv.FormatInt(offset, 10),
strconv.FormatInt(int64(value), 10),
)
c.Run(req)
return req
}
func (c *Client) SetEx(key string, seconds int64, value string) *StatusReq {
req := NewStatusReq("SETEX", key, strconv.FormatInt(seconds, 10), value)
c.Run(req)
return req
}
func (c *Client) SetNx(key, value string) *BoolReq {
req := NewBoolReq("SETNX", key, value)
c.Run(req)
return req
}
func (c *Client) SetRange(key string, offset int64, value string) *IntReq {
req := NewIntReq("SETRANGE", key, strconv.FormatInt(offset, 10), value)
c.Run(req)
return req
}
func (c *Client) StrLen(key string) *IntReq {
req := NewIntReq("STRLEN", key)
c.Run(req) c.Run(req)
return req return req
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
func (c *Client) Sadd(key string, members ...string) *IntReq { func (c *Client) HDel(key string, fields ...string) *IntReq {
args := append([]string{"HDEL", key}, fields...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) HExists(key, field string) *BoolReq {
req := NewBoolReq("HEXISTS", key, field)
c.Run(req)
return req
}
func (c *Client) HGet(key, field string) *BulkReq {
req := NewBulkReq("HGET", key, field)
c.Run(req)
return req
}
func (c *Client) HGetAll(key string) *MultiBulkReq {
req := NewMultiBulkReq("HGETALL", key)
c.Run(req)
return req
}
func (c *Client) HIncrBy(key, field string, incr int64) *IntReq {
req := NewIntReq("HINCRBY", key, field, strconv.FormatInt(incr, 10))
c.Run(req)
return req
}
// hincrbyfloat
func (c *Client) HKeys(key string) *MultiBulkReq {
req := NewMultiBulkReq("HKEYS", key)
c.Run(req)
return req
}
func (c *Client) HLen(key string) *IntReq {
req := NewIntReq("HLEN", key)
c.Run(req)
return req
}
func (c *Client) HMGet(key string, fields ...string) *MultiBulkReq {
args := append([]string{"HMGET", key}, fields...)
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) HMSet(key, field, value string, pairs ...string) *StatusReq {
args := append([]string{"HMSET", key, field, value}, pairs...)
req := NewStatusReq(args...)
c.Run(req)
return req
}
func (c *Client) HSet(key, field, value string) *BoolReq {
req := NewBoolReq("HSET", key, field, value)
c.Run(req)
return req
}
func (c *Client) HSetNX(key, field, value string) *BoolReq {
req := NewBoolReq("HSETNX", key, field, value)
c.Run(req)
return req
}
func (c *Client) HVals(key string) *MultiBulkReq {
req := NewMultiBulkReq("HVALS", key)
c.Run(req)
return req
}
//------------------------------------------------------------------------------
func (c *Client) BLPop(timeout int64, keys ...string) *MultiBulkReq {
args := append([]string{"BLPOP"}, keys...)
args = append(args, strconv.FormatInt(timeout, 10))
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) BRPop(timeout int64, keys ...string) *MultiBulkReq {
args := append([]string{"BRPOP"}, keys...)
args = append(args, strconv.FormatInt(timeout, 10))
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) BRPopLPush(source, destination string, timeout int64) *BulkReq {
req := NewBulkReq(
"BRPOPLPUSH",
source,
destination,
strconv.FormatInt(timeout, 10),
)
c.Run(req)
return req
}
func (c *Client) LIndex(key string, index int64) *BulkReq {
req := NewBulkReq("LINDEX", key, strconv.FormatInt(index, 10))
c.Run(req)
return req
}
func (c *Client) LInsert(key, op, pivot, value string) *IntReq {
req := NewIntReq("LINSERT", key, op, pivot, value)
c.Run(req)
return req
}
func (c *Client) LLen(key string) *IntReq {
req := NewIntReq("LLEN", key)
c.Run(req)
return req
}
func (c *Client) LPop(key string) *BulkReq {
req := NewBulkReq("LPOP", key)
c.Run(req)
return req
}
func (c *Client) LPush(key string, values ...string) *IntReq {
args := append([]string{"LPUSH", key}, values...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) LPushX(key, value string) *IntReq {
req := NewIntReq("LPUSHX", key, value)
c.Run(req)
return req
}
func (c *Client) LRange(key string, start, stop int64) *MultiBulkReq {
req := NewMultiBulkReq(
"LRANGE",
key,
strconv.FormatInt(start, 10),
strconv.FormatInt(stop, 10),
)
c.Run(req)
return req
}
func (c *Client) LRem(key string, count int64, value string) *IntReq {
req := NewIntReq("LREM", key, strconv.FormatInt(count, 10), value)
c.Run(req)
return req
}
func (c *Client) LSet(key string, index int64, value string) *StatusReq {
req := NewStatusReq("LSET", key, strconv.FormatInt(index, 10), value)
c.Run(req)
return req
}
func (c *Client) LTrim(key string, start, stop int64) *StatusReq {
req := NewStatusReq(
"LTRIM",
key,
strconv.FormatInt(start, 10),
strconv.FormatInt(stop, 10),
)
c.Run(req)
return req
}
func (c *Client) RPop(key string) *BulkReq {
req := NewBulkReq("RPOP", key)
c.Run(req)
return req
}
func (c *Client) RPopLPush(source, destination string) *BulkReq {
req := NewBulkReq("RPOPLPUSH", source, destination)
c.Run(req)
return req
}
func (c *Client) RPush(key string, values ...string) *IntReq {
args := append([]string{"RPUSH", key}, values...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) RPushX(key string, value string) *IntReq {
req := NewIntReq("RPUSHX", key, value)
c.Run(req)
return req
}
//------------------------------------------------------------------------------
func (c *Client) SAdd(key string, members ...string) *IntReq {
args := append([]string{"SADD", key}, members...) args := append([]string{"SADD", key}, members...)
req := NewIntReq(args...) req := NewIntReq(args...)
c.Run(req) c.Run(req)
return req return req
} }
func (c *Client) Srem(key string, members ...string) *IntReq { func (c *Client) SCard(key string) *IntReq {
req := NewIntReq("SCARD", key)
c.Run(req)
return req
}
func (c *Client) SDiff(keys ...string) *MultiBulkReq {
args := append([]string{"SDIFF"}, keys...)
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) SDiffStore(destination string, keys ...string) *IntReq {
args := append([]string{"SDIFFSTORE", destination}, keys...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) SInter(keys ...string) *MultiBulkReq {
args := append([]string{"SINTER"}, keys...)
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) SInterStore(destination string, keys ...string) *IntReq {
args := append([]string{"SINTERSTORE", destination}, keys...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) SIsMember(key, member string) *BoolReq {
req := NewBoolReq("SISMEMBER", key, member)
c.Run(req)
return req
}
func (c *Client) SMembers(key string) *MultiBulkReq {
req := NewMultiBulkReq("SMEMBERS", key)
c.Run(req)
return req
}
func (c *Client) SMove(source, destination, member string) *BoolReq {
req := NewBoolReq("SMOVE", source, destination, member)
c.Run(req)
return req
}
func (c *Client) SPop(key string) *BulkReq {
req := NewBulkReq("SPOP", key)
c.Run(req)
return req
}
func (c *Client) SRandMember(key string) *BulkReq {
req := NewBulkReq("SRANDMEMBER", key)
c.Run(req)
return req
}
func (c *Client) SRem(key string, members ...string) *IntReq {
args := append([]string{"SREM", key}, members...) args := append([]string{"SREM", key}, members...)
req := NewIntReq(args...) req := NewIntReq(args...)
c.Run(req) c.Run(req)
return req return req
} }
func (c *Client) Smembers(key string) *MultiBulkReq { func (c *Client) SUnion(keys ...string) *MultiBulkReq {
req := NewMultiBulkReq("SMEMBERS", key) args := append([]string{"SUNION"}, keys...)
req := NewMultiBulkReq(args...)
c.Run(req) c.Run(req)
return req return req
} }
//------------------------------------------------------------------------------ func (c *Client) SUnionStore(destination string, keys ...string) *IntReq {
args := append([]string{"SUNIONSTORE", destination}, keys...)
func (c *Client) Multi() *MultiClient { req := NewIntReq(args...)
return NewMultiClient(c.connect, c.disconnect) c.Run(req)
return req
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -86,77 +653,6 @@ func (c *Client) Publish(channel, message string) *IntReq {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
func (c *Client) Hset(key, field, value string) *BoolReq { func (c *Client) Multi() *Client {
req := NewBoolReq("HSET", key, field, value) return NewMultiClient(c.connect, c.disconnect)
c.Run(req)
return req
}
func (c *Client) Hsetnx(key, field, value string) *BoolReq {
req := NewBoolReq("HSETNX", key, field, value)
c.Run(req)
return req
}
func (c *Client) Hmset(key, field, value string, pairs ...string) *StatusReq {
args := append([]string{"HMSET", key, field, value}, pairs...)
req := NewStatusReq(args...)
c.Run(req)
return req
}
func (c *Client) Hget(key, field string) *BulkReq {
req := NewBulkReq("HGET", key, field)
c.Run(req)
return req
}
func (c *Client) Hmget(key string, fields ...string) *MultiBulkReq {
args := append([]string{"HMGET", key}, fields...)
req := NewMultiBulkReq(args...)
c.Run(req)
return req
}
func (c *Client) Hexists(key, field string) *BoolReq {
req := NewBoolReq("HEXISTS", key, field)
c.Run(req)
return req
}
func (c *Client) Hdel(key string, fields ...string) *IntReq {
args := append([]string{"HDEL", key}, fields...)
req := NewIntReq(args...)
c.Run(req)
return req
}
func (c *Client) Hlen(key string) *IntReq {
req := NewIntReq("HLEN", key)
c.Run(req)
return req
}
func (c *Client) Hgetall(key string) *MultiBulkReq {
req := NewMultiBulkReq("HGETALL", key)
c.Run(req)
return req
}
func (c *Client) Hkeys(key string) *MultiBulkReq {
req := NewMultiBulkReq("HKEYS", key)
c.Run(req)
return req
}
func (c *Client) Hvals(key string) *MultiBulkReq {
req := NewMultiBulkReq("HVALS", key)
c.Run(req)
return req
}
func (c *Client) Hincrby(key, field string, incr int64) *IntReq {
req := NewIntReq("HINCRBY", key, field, strconv.FormatInt(incr, 10))
c.Run(req)
return req
} }

View File

@ -1,48 +0,0 @@
package redis
type MultiClient struct {
*Client
reqs []Req
}
func NewMultiClient(connect connectFunc, disconnect disconnectFunc) *MultiClient {
return &MultiClient{
Client: NewClient(connect, disconnect),
reqs: make([]Req, 0),
}
}
func (c *MultiClient) queueReq(req Req) {
c.reqs = append(c.reqs, req)
}
func (c *MultiClient) run(req Req) {
c.queueReq(req)
}
func (c *MultiClient) Exec() ([]Req, error) {
c.mtx.Lock()
defer c.mtx.Unlock()
reqs := c.reqs
c.reqs = make([]Req, 0)
multiReq := make([]byte, 0, 8192)
multiReq = append(multiReq, PackReq([]string{"MULTI"})...)
for _, req := range reqs {
multiReq = append(multiReq, req.Req()...)
}
multiReq = append(multiReq, PackReq([]string{"EXEC"})...)
buf, err := c.WriteRead(multiReq)
if err != nil {
return nil, err
}
for _, req := range reqs {
req.ParseReply(buf)
}
return reqs, nil
}

View File

@ -1,6 +1,7 @@
package redis package redis
import ( import (
"fmt"
"io" "io"
"sync" "sync"
@ -16,6 +17,8 @@ type Client struct {
disconnect disconnectFunc disconnect disconnectFunc
currConn io.ReadWriter currConn io.ReadWriter
rd *bufreader.Reader rd *bufreader.Reader
reqs []Req
} }
func NewClient(connect connectFunc, disconnect disconnectFunc) *Client { func NewClient(connect connectFunc, disconnect disconnectFunc) *Client {
@ -26,6 +29,16 @@ func NewClient(connect connectFunc, disconnect disconnectFunc) *Client {
} }
} }
func NewMultiClient(connect connectFunc, disconnect disconnectFunc) *Client {
return &Client{
rd: bufreader.NewSizedReader(8192),
connect: connect,
disconnect: disconnect,
reqs: make([]Req, 0),
}
}
func (c *Client) Close() error { func (c *Client) Close() error {
if c.disconnect != nil { if c.disconnect != nil {
c.disconnect(c.currConn) c.disconnect(c.currConn)
@ -71,6 +84,8 @@ func (c *Client) ReadReply() (*bufreader.Reader, error) {
} }
func (c *Client) WriteRead(buf []byte) (*bufreader.Reader, error) { func (c *Client) WriteRead(buf []byte) (*bufreader.Reader, error) {
c.mtx.Lock()
defer c.mtx.Unlock()
if err := c.WriteReq(buf); err != nil { if err := c.WriteReq(buf); err != nil {
return nil, err return nil, err
} }
@ -78,16 +93,84 @@ func (c *Client) WriteRead(buf []byte) (*bufreader.Reader, error) {
} }
func (c *Client) Run(req Req) { func (c *Client) Run(req Req) {
c.mtx.Lock() if c.reqs != nil {
c.run(req) c.mtx.Lock()
c.mtx.Unlock() c.reqs = append(c.reqs, req)
} c.mtx.Unlock()
return
}
func (c *Client) run(req Req) { rd, err := c.WriteRead(req.Req())
buf, err := c.WriteRead(req.Req())
if err != nil { if err != nil {
req.SetErr(err) req.SetErr(err)
return return
} }
req.ParseReply(buf) req.ParseReply(rd)
}
//------------------------------------------------------------------------------
func (c *Client) Discard() {
if c.reqs == nil {
panic("MultiClient required")
}
c.mtx.Lock()
c.reqs = c.reqs[:0]
c.mtx.Unlock()
}
func (c *Client) Exec() ([]Req, error) {
if c.reqs == nil {
panic("MultiClient required")
}
c.mtx.Lock()
reqs := c.reqs
c.reqs = make([]Req, 0)
c.mtx.Unlock()
multiReq := make([]byte, 0, 1024)
multiReq = append(multiReq, PackReq([]string{"MULTI"})...)
for _, req := range reqs {
multiReq = append(multiReq, req.Req()...)
}
multiReq = append(multiReq, PackReq([]string{"EXEC"})...)
rd, err := c.WriteRead(multiReq)
if err != nil {
return nil, err
}
statusReq := NewStatusReq()
// multi
statusReq.ParseReply(rd)
_, err = statusReq.Reply()
if err != nil {
return nil, err
}
for _ = range reqs {
// queue
statusReq.ParseReply(rd)
_, err = statusReq.Reply()
if err != nil {
return nil, err
}
}
line, err := rd.ReadLine('\n')
if err != nil {
return nil, err
}
if line[0] != '*' {
return nil, fmt.Errorf("Expected '*', but got line %q of %q.", line, rd.Bytes())
}
for _, req := range reqs {
req.ParseReply(rd)
}
return reqs, nil
} }

File diff suppressed because it is too large Load Diff