Skip to content

Commit

Permalink
Merge pull request joyieldInc#73 from leenr/master
Browse files Browse the repository at this point in the history
Add support for `zpopmax` and `zpopmin` redis commands (server 5.0.0+)
  • Loading branch information
fortrue authored Feb 9, 2019
2 parents ca9cde0 + ebf7bd2 commit dacf3fb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ Command Command::CmdPool[AvailableCommands] = {
{Zincrby, "zincrby", 4, 4, Write},
{Zinterstore, "zinterstore", 4, MaxArgs, Write},
{Zlexcount, "zlexcount", 4, 4, Read},
{Zpopmax, "zpopmax", 2, 3, Write},
{Zpopmin, "zpopmin", 2, 3, Write},
{Zrange, "zrange", 4, 5, Read},
{Zrangebylex, "zrangebylex", 4, 7, Read},
{Zrangebyscore, "zrangebyscore", 4, 8, Read},
Expand Down
2 changes: 2 additions & 0 deletions src/Command.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ class Command
Zincrby,
Zinterstore,
Zlexcount,
Zpopmax,
Zpopmin,
Zrange,
Zrangebylex,
Zrangebyscore,
Expand Down
8 changes: 7 additions & 1 deletion test/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@
[('scard', '{k}2'), 3],
]),
('zset', [
[('del', 'k', '{k}2', '{k}3', '{k}4'), ],
[('del', 'k', '{k}2', '{k}3', '{k}4', '{k}5', '{k}6'), ],
[('zadd', 'k', 10, 'apple'), 1],
[('zcard', 'k'), 1],
[('zincrby', 'k', 2, 'apple'), '12'],
Expand Down Expand Up @@ -438,6 +438,12 @@
[('zunionstore', '{k}3', 2, 'k', '{k}2'), 4],
[('zunionstore', '{k}3', 2, 'k', '{k}2', 'AGGREGATE', 'MAX'), 4],
[('zunionstore', '{k}3', 2, 'k', '{k}2', 'WEIGHTS', 0.5, 1.2, 'AGGREGATE', 'MAX'), 4],
[('zadd', '{k}5', 0, 'apple', 9, 'banana', 1, 'pear', 3, 'orange', 4, 'cat'), 5],
[('zpopmax', '{k}5'), ['banana', '9']],
[('zpopmax', '{k}5', 3), ['cat', '4', 'orange', '3', 'pear', '1']],
[('zadd', '{k}6', 0, 'apple', 9, 'banana', 1, 'pear', 3, 'orange', 4, 'cat'), 5],
[('zpopmin', '{k}6'), ['apple', '0']],
[('zpopmin', '{k}6', 3), ['pear', '1', 'orange', '3', 'cat', '4']],
]),
('hyperloglog', [
[('del', 'k', '{k}2', '{k}3'), ],
Expand Down

0 comments on commit dacf3fb

Please sign in to comment.