Bigint support in HINCRBY, test fixes.

Author: nicolasff

redis.c

@@ -4029,23 +4029,36 @@ PHP_METHOD(Redis, hIncrBy)
 {
     zval *object;
     RedisSock *redis_sock;
-    char *key = NULL, *cmd, *member;
-    int key_len, member_len, cmd_len;
-    long val;
+    char *key = NULL, *cmd, *member, *val;
+    int key_len, member_len, cmd_len, val_len;
+	int i;
 
-    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossl",
+    if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osss",
                                      &object, redis_ce,
-                                     &key, &key_len, &member, &member_len, &val) == FAILURE) {
+                                     &key, &key_len, &member, &member_len, &val, &val_len) == FAILURE) {
         RETURN_FALSE;
     }
 
     if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) {
         RETURN_FALSE;
     }
 
+	/* check for validity of numeric string */
+	i = 0;
+	if(val_len && val[0] == '-') { /* negative case */
+		i++;
+	}
+	for(i = 0; i < val_len; ++i) {
+		if(val[i] < '0' || val[i] > '9') {
+			RETURN_FALSE;
+		}
+	}
+
+
+
     /* HINCRBY key member amount */
 	int key_free = redis_key_prefix(redis_sock, &key, &key_len);
-    cmd_len = redis_cmd_format_static(&cmd, "HINCRBY", "ssd", key, key_len, member, member_len, val);
+    cmd_len = redis_cmd_format_static(&cmd, "HINCRBY", "sss", key, key_len, member, member_len, val, val_len);
 	if(key_free) efree(key);
 
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);

tests/TestRedis.php

@@ -1802,6 +1802,8 @@ public function testHashes() {
 	$this->redis->delete('h');
 	$this->assertTrue(2 === $this->redis->hIncrBy('h', 'x', 2));
 	$this->assertTrue(3 === $this->redis->hIncrBy('h', 'x', 1));
+	$this->assertTrue(FALSE === $this->redis->hIncrBy('h', 'x', "not-a-number"));
+	$this->assertTrue("3" === $this->redis->hGet('h', 'x'));
 
 	$this->redis->hSet('h', 'y', 'not-a-number');
 	$this->assertTrue(FALSE === $this->redis->hIncrBy('h', 'y', 1));
@@ -1839,7 +1841,9 @@ public function testSetRange() {
 	    $this->redis->setRange('key', 6, 'you'); // don't cut off the end
 	    $this->assertTrue('hello youis' === $this->redis->get('key'));
 
-	    $this->assertTrue(FALSE === $this->redis->setRange('key', -1, 'plop')); // doesn't work with negative offsets
+	    $this->redis->set('key', 'hello world');
+	    $this->assertTrue(11 === $this->redis->setRange('key', -6, 'redis')); // works with negative offsets too!
+	    $this->assertTrue('hello redis' === $this->redis->get('key'));
 
 	    // fill with zeros if needed
 	    $this->redis->delete('key');