Merge branch 'hotfix/srandmember_serialize' into develop

michael-grunder · michael-grunder · commit dc5f40d0e8c4 · 2013-11-13T11:23:45.000-08:00
diff --git a/redis.c b/redis.c
@@ -2346,14 +2346,32 @@ PHP_METHOD(Redis, sRandMember)
     // Process our command
     REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 
-    // Process our reply
-    IF_ATOMIC() {
+    // Either bulk or multi-bulk depending on argument count
+    if(ZEND_NUM_ARGS() == 2) {
+        IF_ATOMIC() {
+            if(redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAM_PASSTHRU,
+                                               redis_sock, NULL, NULL) < 0)
+            {
+                RETURN_FALSE;
+            }
+        }
+        REDIS_PROCESS_RESPONSE(redis_sock_read_multibulk_reply);
+    } else {
+        IF_ATOMIC() {
+            redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock,
+                                  NULL, NULL);
+        }
+        REDIS_PROCESS_RESPONSE(redis_string_response);
+    }
+
+    /*IF_ATOMIC() {
         // This will be bulk or multi-bulk depending if we passed the optional [COUNT] argument
         if(redis_read_variant_reply(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL) < 0) {
             RETURN_FALSE;
         }
     }
     REDIS_PROCESS_RESPONSE(redis_read_variant_reply);
+    */
 }
 /* }}} */
 
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -1127,23 +1127,45 @@ public function testsPop()
     }
 
     public function testsRandMember() {
-	$this->redis->delete('set0');
-	$this->assertTrue($this->redis->sRandMember('set0') === FALSE);
+        $this->redis->delete('set0');
+        $this->assertTrue($this->redis->sRandMember('set0') === FALSE);
 
-	$this->redis->sAdd('set0', 'val');
-	$this->redis->sAdd('set0', 'val2');
+        $this->redis->sAdd('set0', 'val');
+        $this->redis->sAdd('set0', 'val2');
 
-	$got = array();
-	while(true) {
-	    $v = $this->redis->sRandMember('set0');
-	    $this->assertTrue(2 === $this->redis->sSize('set0')); // no change.
-	    $this->assertTrue($v === 'val' || $v === 'val2');
+        $got = array();
+        while(true) {
+            $v = $this->redis->sRandMember('set0');
+            $this->assertTrue(2 === $this->redis->sSize('set0')); // no change.
+            $this->assertTrue($v === 'val' || $v === 'val2');
 
-	    $got[$v] = $v;
-	    if(count($got) == 2) {
-	        break;
-	    }
-	}
+            $got[$v] = $v;
+            if(count($got) == 2) {
+                break;
+            }
+        }
+
+        // 
+        // With and without count, while serializing
+        // 
+
+        $this->redis->delete('set0');
+        $this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
+        for($i=0;$i<5;$i++) {
+            $member = "member:$i";
+            $this->redis->sAdd('set0', $member);
+            $mems[] = $member;
+        }
+
+        $member = $this->redis->srandmember('set0');
+        $this->assertTrue(in_array($member, $mems));
+
+        $rmembers = $this->redis->srandmember('set0', $i);
+        foreach($rmembers as $reply_mem) {
+            $this->assertTrue(in_array($reply_mem, $mems));
+        }
+
+        $this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
     }
 
     public function testSRandMemberWithCount() {
