Merge pull request #163 from mkhq/master

SRANDMEMBER support for the optional count argument
twitter · Dec 6, 2013 · a747b9b · a747b9b
2 parents b2cd3ad + 7032ed7
commit a747b9b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/notes/redis.md b/notes/redis.md
@@ -195,7 +195,7 @@
     +-------------------+------------+---------------------------------------------------------------------------------------------------------------------+
     |      SPOP         |    Yes     | SPOP key                                                                                                            |
     +-------------------+------------+---------------------------------------------------------------------------------------------------------------------+
-    |    SRANDMEMBER    |    Yes     | SRANDMEMBER key                                                                                                     |
+    |    SRANDMEMBER    |    Yes     | SRANDMEMBER key [count]                                                                                             |
     +-------------------+------------+---------------------------------------------------------------------------------------------------------------------+
     |      SREM         |    Yes     | SREM key member [member ...]                                                                                        |
     +-------------------+------------+---------------------------------------------------------------------------------------------------------------------+

diff --git a/scripts/redis-check.sh b/scripts/redis-check.sh
@@ -433,6 +433,7 @@ printf '*4\r\n$4\r\nsadd\r\n$4\r\nsfoo\r\n$3\r\nbar\r\n$3\r\nbas\r\n' | socat ${
 printf '*2\r\n$11\r\nsrandmember\r\n$4\r\nsfoo\r\n' | socat ${debug} ${timeout} - TCP:localhost:${port},shut-close
 printf '*2\r\n$11\r\nsrandmember\r\n$4\r\nsfoo\r\n' | socat ${debug} ${timeout} - TCP:localhost:${port},shut-close
 printf '*2\r\n$11\r\nsrandmember\r\n$4\r\nsfoo\r\n' | socat ${debug} ${timeout} - TCP:localhost:${port},shut-close
+printf '*3\r\n$11\r\nsrandmember\r\n$4\r\nsfoo\r\n$1\r\n2\r\n' | socat ${debug} ${timeout} - TCP:localhost:${port},shut-close
 
 printf '\nsrem\n'
 printf '*2\r\n$3\r\ndel\r\n$4\r\nsfoo\r\n' | socat ${debug} ${timeout} - TCP:localhost:${port},shut-close

diff --git a/src/proto/nc_redis.c b/src/proto/nc_redis.c
@@ -53,7 +53,6 @@ redis_arg0(struct msg *r)
     case MSG_REQ_REDIS_SCARD:
     case MSG_REQ_REDIS_SMEMBERS:
     case MSG_REQ_REDIS_SPOP:
-    case MSG_REQ_REDIS_SRANDMEMBER:
 
     case MSG_REQ_REDIS_ZCARD:
         return true;
@@ -193,6 +192,7 @@ redis_argn(struct msg *r)
     case MSG_REQ_REDIS_SREM:
     case MSG_REQ_REDIS_SUNION:
     case MSG_REQ_REDIS_SUNIONSTORE:
+    case MSG_REQ_REDIS_SRANDMEMBER:
 
     case MSG_REQ_REDIS_ZADD:
     case MSG_REQ_REDIS_ZINTERSTORE: