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 #55 from geoffgarside/fix-sort-by 

Fix SORT .. BY pattern syntax error
This commit is contained in:
Vladimir Mihailenco 2014-12-09 13:07:59 +02:00
parent 3406aebc13 daade895aa
commit e617904962
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands.go
View File

@ -196,7 +196,7 @@ type Sort struct {
func (c *Client) Sort(key string, sort Sort) *StringSliceCmd { func (c *Client) Sort(key string, sort Sort) *StringSliceCmd {
args := []string{"SORT", key} args := []string{"SORT", key}
if sort.By != "" { if sort.By != "" {
args = append(args, 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", formatFloat(sort.Offset), formatFloat(sort.Count))

23
redis_test.go
View File

@ -786,6 +786,29 @@ func (t *RedisTest) TestCmdKeysSort(c *C) {
c.Assert(sort.Val(), DeepEquals, []string{"1", "2"}) c.Assert(sort.Val(), DeepEquals, []string{"1", "2"})
} }
func (t *RedisTest) TestCmdKeysSortBy(c *C) {
lPush := t.client.LPush("list", "1")
c.Assert(lPush.Err(), IsNil)
c.Assert(lPush.Val(), Equals, int64(1))
lPush = t.client.LPush("list", "3")
c.Assert(lPush.Err(), IsNil)
c.Assert(lPush.Val(), Equals, int64(2))
lPush = t.client.LPush("list", "2")
c.Assert(lPush.Err(), IsNil)
c.Assert(lPush.Val(), Equals, int64(3))
set := t.client.Set("weight_1", "5")
c.Assert(set.Err(), IsNil)
set = t.client.Set("weight_2", "2")
c.Assert(set.Err(), IsNil)
set = t.client.Set("weight_3", "8")
c.Assert(set.Err(), IsNil)
sort := t.client.Sort("list", redis.Sort{Offset: 0, Count: 2, Order: "ASC", By: "weight_*"})
c.Assert(sort.Err(), IsNil)
c.Assert(sort.Val(), DeepEquals, []string{"2", "1"})
}
func (t *RedisTest) TestCmdKeysTTL(c *C) { func (t *RedisTest) TestCmdKeysTTL(c *C) {
ttl := t.client.TTL("key") ttl := t.client.TTL("key")
c.Assert(ttl.Err(), IsNil) c.Assert(ttl.Err(), IsNil)