Fixed HINCRBY.

Author: nicolasff

README.markdown

@@ -1571,13 +1571,13 @@ $this->hExists('h', 'NonExistingKey'); /* FALSE */
 Increments the value of a member from a hash by a given amount.
 ##### Parameters
 *key*  
-*value*: (double) value that will be added to the member's value  
 *member*  
+*value*: (integer) value that will be added to the member's value  
 ##### Return value
-*DOUBLE* the new value
+*LONG* the new value
 ##### Examples
 <pre>
 $redis->delete('h');
-$redis->hIncrBy('h', 2.5, 'x'); /* returns 2.5: h[x] = 2.5 now. */
-$redis->zIncrBy('h', 1, 'x'); /* h[x] ← 2.5 + 1. Returns 3.5 */
+$redis->hIncrBy('h', 'x', 2); /* returns 2: h[x] = 2 now. */
+$redis->zIncrBy('h', 'x', 1); /* h[x] ← 2 + 1. Returns 3 */
 </pre>

redis.c

@@ -3642,7 +3642,47 @@ PHPAPI void array_zip_values_and_scores(INTERNAL_FUNCTION_PARAMETERS, int use_at
 
 PHP_METHOD(Redis, hIncrBy)
 {
-    generic_incrby_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, "HINCRBY", sizeof("HINCRBY")-1 TSRMLS_CC);
+    zval *object;
+    RedisSock *redis_sock;
+    char *key = NULL, *cmd, *member, *response;
+    int key_len, member_len, cmd_len, response_len;
+    long val;
+
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossl",
+                                     &object, redis_ce,
+                                     &key, &key_len, &member, &member_len, &val) == FAILURE) {
+        RETURN_FALSE;
+    }
+
+    if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) {
+        RETURN_FALSE;
+    }
+
+    /* HINCRBY key member amount */
+    cmd_len = redis_cmd_format(&cmd,
+                    "*4" _NL
+                    "$7" _NL
+                    "HINCRBY" _NL
+
+                    "$%d" _NL /* key_len */
+                    "%s" _NL  /* key */
+
+                    "$%d" _NL /* member_len */
+                    "%s" _NL  /* member */
+
+                    "$%d" _NL /* val_len */
+                    "%d" _NL  /* val */
+
+                    , key_len, key, key_len
+                    , member_len, member, member_len
+                    , integer_length(val), val);
+
+	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);
+
 }
 
 PHPAPI int redis_response_enqueued(RedisSock *redis_sock TSRMLS_DC) {

tests/TestRedis.php

@@ -1450,8 +1450,8 @@ public function testZX() {
 	$this->redis->delete('keyI');
 	$this->assertTrue( 2 === $this->redis->zInter('keyI', array('key1', 'key2', 'key3'), array(1, 5, 1), 'max'));
 	$this->assertTrue(array('val3', 'val1') === $this->redis->zRange('keyI', 0, -1));
-
 }
+
     public function testHashes() {
 	$this->redis->delete('h', 'key');
 
@@ -1499,14 +1499,12 @@ public function testHashes() {
 	$this->assertTrue(FALSE === $this->redis->hExists('h', 'x'));
 
 	// hIncrBy
-	/*
 	$this->redis->delete('h');
-	$this->assertTrue(2 === $this->redis->hIncrBy('h', 2, 'x'));
-	$this->assertTrue(3 === $this->redis->hIncrBy('h', 1, 'x'));
+	$this->assertTrue(2 === $this->redis->hIncrBy('h', 'x', 2));
+	$this->assertTrue(3 === $this->redis->hIncrBy('h', 'x', 1));
 
 	$this->redis->hSet('h', 'y', 'not-a-number');
-	$this->assertTrue(FALSE === $this->redis->hIncrBy('h', 1, 'y'));
-	*/
+	$this->assertTrue(1 === $this->redis->hIncrBy('h', 'y', 1));
 
     }
 }

tests/executeTests.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-phpunit --repeat 1 Redis_Test ./TestRedis.php
+phpunit Redis_Test ./TestRedis.php