Fixed HSET, added more tests.

Author: nicolasff

README.markdown

@@ -1396,14 +1396,14 @@ Adds a value to the hash stored at key. If this value is already in the hash, `F
 *value*
 
 ##### *Return value*
-*BOOL* `TRUE` if value didn't exist and was added successfully, `FALSE` if the value was already present and was replaced.
+*LONG* `1` if value didn't exist and was added successfully, `0` if the value was already present and was replaced, `FALSE` if there was an error.
 ##### *Example*
 <pre>
 $redis->delete('h')
-$redis->hSet('h', 'key1', 'hello'); /* TRUE, 'key1' => 'hello' in the hash at "h" */
+$redis->hSet('h', 'key1', 'hello'); /* 1, 'key1' => 'hello' in the hash at "h" */
 $redis->hGet('h', 'key1'); /* returns "hello" */
 
-$redis->hSet('h', 'key1', 'plop'); /* FALSE, value was replaced. */
+$redis->hSet('h', 'key1', 'plop'); /* 0, value was replaced. */
 $redis->hGet('h', 'key1'); /* returns "plop" */
 </pre>
 

redis.c

@@ -3355,9 +3355,9 @@ PHP_METHOD(Redis, hSet)
 
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 	IF_ATOMIC() {
-	  redis_1_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL TSRMLS_CC);
+	  redis_long_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL TSRMLS_CC);
 	}
-	REDIS_PROCESS_RESPONSE(redis_1_response);
+	REDIS_PROCESS_RESPONSE(redis_long_response);
 }
 /* }}} */
 

tests/TestRedis.php

@@ -1457,15 +1457,15 @@ public function testHashes() {
 	$this->redis->delete('h', 'key');
 
 	$this->assertTrue(0 === $this->redis->hLen('h'));
-	$this->assertTrue(TRUE === $this->redis->hSet('h', 'a', 'a-value'));
+	$this->assertTrue(1 === $this->redis->hSet('h', 'a', 'a-value'));
 	$this->assertTrue(1 === $this->redis->hLen('h'));
-	$this->assertTrue(TRUE === $this->redis->hSet('h', 'b', 'b-value'));
+	$this->assertTrue(1 === $this->redis->hSet('h', 'b', 'b-value'));
 	$this->assertTrue(2 === $this->redis->hLen('h'));
 
 	$this->assertTrue('a-value' === $this->redis->hGet('h', 'a')); 	// simple get
 	$this->assertTrue('b-value' === $this->redis->hGet('h', 'b')); 	// simple get
 
-	$this->assertTrue(FALSE === $this->redis->hSet('h', 'a', 'another-value')); // replacement
+	$this->assertTrue(0 === $this->redis->hSet('h', 'a', 'another-value')); // replacement
 	$this->assertTrue('another-value' === $this->redis->hGet('h', 'a')); 	// get the new value
 
 	$this->assertTrue('b-value' === $this->redis->hGet('h', 'b')); 	// simple get
@@ -1508,7 +1508,6 @@ public function testHashes() {
 	$this->assertTrue(FALSE === $this->redis->hIncrBy('h', 'y', 1));
     }
 
-
     public function testMultiExec() {
 	$this->sequence(Redis::MULTI);
     }
@@ -1997,24 +1996,35 @@ protected function sequence($mode) {
 		    ->hexists('hkey1', 'key2')
 		    ->hkeys('hkey1')
 		    ->hvals('hkey1')
-	//	    ->hgetall('hkey1')
-		    //->hincrby()
+		    ->hgetall('hkey1')
+		    ->hset('hkey1', 'valn', 1)
+		    ->hincrby('hkey1', 'valn', 4)
+		    ->hincrby('hkey1', 'val-fail', 42)
+		    ->hset('hkey1', 'val-fail', 'non-string')
+		    ->hget('hkey1', 'val-fail')
+		    ->hincrby('hkey1', 'val-fail', 42)
 		    ->exec();
 
 	    $i = 0;
 	    $this->assertTrue(is_array($ret));
 	    $this->assertTrue($ret[$i++] <= 1); // delete
-	    $this->assertTrue($ret[$i++] === TRUE); // added 1 element
-	    $this->assertTrue($ret[$i++] === TRUE); // added 1 element
-	    $this->assertTrue($ret[$i++] === TRUE); // added 1 element
+	    $this->assertTrue($ret[$i++] === 1); // added 1 element
+	    $this->assertTrue($ret[$i++] === 1); // added 1 element
+	    $this->assertTrue($ret[$i++] === 1); // added 1 element
 	    $this->assertTrue($ret[$i++] === 'value1'); // hget
 	    $this->assertTrue($ret[$i++] === 3); // hlen
 	    $this->assertTrue($ret[$i++] === TRUE); // hdel succeeded
 	    $this->assertTrue($ret[$i++] === FALSE); // hdel failed
 	    $this->assertTrue($ret[$i++] === FALSE); // hexists didn't find the deleted key
 	    $this->assertTrue($ret[$i] === array('key1', 'key3') || $ret[$i] === array('key3', 'key1')); $i++; // hkeys
 	    $this->assertTrue($ret[$i] === array('value1', 'value3') || $ret[$i] === array('value3', 'value1')); $i++; // hvals
-	    //$this->assertTrue($ret[$i] === array('key1' => 'value1', 'key3' => 'value3') || $ret[$i] === array('key3' => 'value3', 'key1' => 'value1')); $i++; // hgetall
+	    $this->assertTrue($ret[$i] === array('key1' => 'value1', 'key3' => 'value3') || $ret[$i] === array('key3' => 'value3', 'key1' => 'value1')); $i++; // hgetall
+	    $this->assertTrue($ret[$i++] === 1); // added 1 element
+	    $this->assertTrue($ret[$i++] === 5); // added 4 to value 1 → 5
+	    $this->assertTrue($ret[$i++] === 42); // member doesn't exist → assume 0, and then add.
+	    $this->assertTrue($ret[$i++] === 0); // didn't add the element, already present, so 0.
+	    $this->assertTrue($ret[$i++] === 'non-string'); // hset succeeded
+	    $this->assertTrue($ret[$i++] === FALSE); // member isn't a number → fail.
 	    $this->assertTrue(count($ret) === $i);
 
     }