ported change to RENAMENX from upstream Redis.

nicolasff · nicolasff · commit 99af20e3ef1a · 2011-03-30T13:37:23.000+02:00
diff --git a/redis.c b/redis.c
@@ -733,9 +733,9 @@ PHP_METHOD(Redis, renameNx)
 
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 	IF_ATOMIC() {
-		redis_boolean_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
+		redis_1_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);
 	}
-	REDIS_PROCESS_RESPONSE(redis_boolean_response);
+	REDIS_PROCESS_RESPONSE(redis_1_response);
 
 }
 /* }}} */
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -218,7 +218,7 @@ public function testRename() {
     public function testRenameNx() {
 
 	// strings
-	$this->redis->delete('key0');
+	$this->redis->delete('key0', 'key1');
 	$this->redis->set('key0', 'val0');
 	$this->redis->set('key1', 'val1');
 	$this->assertTrue($this->redis->renameNx('key0', 'key1') === FALSE);
@@ -232,12 +232,12 @@ public function testRenameNx() {
 	$this->redis->lPush('key0', 'val1');
 	$this->redis->lPush('key1', 'val1-0');
 	$this->redis->lPush('key1', 'val1-1');
-	$this->redis->renameNx('key0', 'key1');
+	$this->assertTrue($this->redis->renameNx('key0', 'key1') === FALSE);
 	$this->assertTrue($this->redis->lGetRange('key0', 0, -1) === array('val1', 'val0'));
 	$this->assertTrue($this->redis->lGetRange('key1', 0, -1) === array('val1-1', 'val1-0'));
 
 	$this->redis->delete('key2');
-	$this->redis->renameNx('key0', 'key2');
+	$this->assertTrue($this->redis->renameNx('key0', 'key2') === TRUE);
 	$this->assertTrue($this->redis->lGetRange('key0', 0, -1) === array());
 	$this->assertTrue($this->redis->lGetRange('key2', 0, -1) === array('val1', 'val0'));
 

Original file line number	Diff line number	Diff line change
`@@ -733,9 +733,9 @@ PHP_METHOD(Redis, renameNx)`
`733`	`733`
`734`	`734`	`REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);`
`735`	`735`	`IF_ATOMIC() {`
`736`		`- redis_boolean_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);`
	`736`	`+ redis_1_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL);`
`737`	`737`	`}`
`738`		`- REDIS_PROCESS_RESPONSE(redis_boolean_response);`
	`738`	`+ REDIS_PROCESS_RESPONSE(redis_1_response);`
`739`	`739`
`740`	`740`	`}`
`741`	`741`	`/* }}} */`