Added ZCOUNT + tests & docs.

nicolasff · nicolasff · commit 049727f3e637 · 2010-07-23T10:29:32.000+02:00
diff --git a/README.markdown b/README.markdown
@@ -1284,6 +1284,24 @@ $redis->zRangeByScore('key', 0, 3, array('limit' => array(1, 1)); /* array('val2
 $redis->zRangeByScore('key', 0, 3, array('withscores' => TRUE, 'limit' => array(1, 1)); /* array('val2' => 2) */
 </pre>
 
+## zCount
+##### *Description*
+Returns the *number* of elements of the sorted set stored at the specified key which have scores in the range [start,end].
+##### *Parameters*
+*key*  
+*start*: double  
+*end*: double  
+
+##### *Return value*
+*LONG* the size of a corresponding zRangeByScore.  
+##### *Example*
+<pre>
+$redis->zAdd('key', 0, 'val0');
+$redis->zAdd('key', 2, 'val2');
+$redis->zAdd('key', 10, 'val10');
+$redis->zCount('key', 0, 3); /* 2, corresponding to array('val0', 'val2') */
+</pre>
+
 ## zDeleteRangeByScore, zRemoveRangeByScore
 ##### *Description*
 Deletes the elements of the sorted set stored at the specified key which have scores in the range [start,end].
diff --git a/php_redis.h b/php_redis.h
@@ -85,6 +85,7 @@ PHP_METHOD(Redis, zDelete);
 PHP_METHOD(Redis, zRange);
 PHP_METHOD(Redis, zReverseRange);
 PHP_METHOD(Redis, zRangeByScore);
+PHP_METHOD(Redis, zCount);
 PHP_METHOD(Redis, zDeleteRangeByScore);
 PHP_METHOD(Redis, zCard);
 PHP_METHOD(Redis, zScore);
diff --git a/redis.c b/redis.c
@@ -113,6 +113,7 @@ static zend_function_entry redis_functions[] = {
      PHP_ME(Redis, zRange, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, zReverseRange, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, zRangeByScore, NULL, ZEND_ACC_PUBLIC)
+     PHP_ME(Redis, zCount, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, zDeleteRangeByScore, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, zCard, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, zScore, NULL, ZEND_ACC_PUBLIC)
@@ -3081,6 +3082,54 @@ PHP_METHOD(Redis, zRangeByScore)
 }
 /* }}} */
 
+/* {{{ proto array Redis::zCount(string key, int start , int end)
+ */
+PHP_METHOD(Redis, zCount)
+{
+    zval *object;
+
+    RedisSock *redis_sock;
+    char *key = NULL, *cmd;
+    int key_len, cmd_len, response_len;
+    double start, end;
+
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osdd",
+                                     &object, redis_ce,
+                                     &key, &key_len, &start, &end) == FAILURE) {
+        RETURN_FALSE;
+    }
+
+    if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) {
+        RETURN_FALSE;
+    }
+
+    cmd_len = redis_cmd_format(&cmd,
+                    "*4" _NL
+
+                    "$6" _NL
+                    "ZCOUNT" _NL
+
+                    "$%d" _NL /* key_len */
+                    "%s" _NL  /* key */
+
+                    "$%d" _NL /* start_len */
+                    "%F" _NL  /* start */
+
+                    "$%d" _NL /* end_len */
+                    "%F" _NL  /* end */
+
+                    , key_len, key, key_len
+                    , double_length(start), start
+                    , double_length(end), end);
+
+	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
+	IF_ATOMIC() {
+	  redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL TSRMLS_CC);
+	}
+	REDIS_PROCESS_RESPONSE(redis_long_response);
+}
+/* }}} */
+
 /* {{{ proto long Redis::zCard(string key)
  */
 PHP_METHOD(Redis, zCard)
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -1365,11 +1365,13 @@ public function testZX() {
 
 	$zero_to_three = $this->redis->zRangeByScore('key', 0, 3);
 	$this->assertTrue(array('val0', 'val1', 'val2', 'aal3', 'val3') === $zero_to_three || array('val0', 'val1', 'val2', 'val3', 'aal3') === $zero_to_three);
+	$this->assertTrue(5 === $this->redis->zCount('key', 0, 3));
 
 	// withscores
 	$this->redis->zRemove('key', 'aal3');
 	$zero_to_three = $this->redis->zRangeByScore('key', 0, 3, array('withscores' => TRUE));
 	$this->assertTrue(array('val0' => 0, 'val1' => 1, 'val2' => 2, 'val3' => 3) == $zero_to_three);
+	$this->assertTrue(4 === $this->redis->zCount('key', 0, 3));
 
 	// limit
 	$this->assertTrue(array('val0') === $this->redis->zRangeByScore('key', 0, 3, array('limit' => array(0, 1))));
