MULTI/EXEC updates and documentation.

Author: nicolasff

README.markdown

@@ -142,6 +142,30 @@ $redis->delete('key1', 'key2'); /* return 2 */
 $redis->delete(array('key3', 'key4')); /* return 2 */
 </pre>
 
+## multi, exec.
+##### Description
+Enter and exit transactional mode.  
+##### Parameters
+(optional) `Redis::MULTI` or `Redis::PIPELINE`. Defaults to `Redis::MULTI`. A `Redis::MULTI` block of commands runs as a single transaction; a `Redis::PIPELINE` block is simply transmitted faster to the server, but without any guarantee of atomicity.  
+##### Return value
+`multi()` returns the Redis instance and enters multi-mode. Once in multi-mode, all subsequent method calls return the same object until `exec()` is called.
+##### Example
+<pre>
+$ret = $redis->multi()
+    ->set('key1', 'val1')
+    ->get('key1')
+    ->set('key2', 'val2')
+    ->get('key2')
+    ->exec();
+
+/*
+$ret == array(
+    0 => TRUE,
+    1 => 'val1',
+    2 => TRUE,
+    3 => 'val2');
+*/
+</pre>
 
 ## exists
 ##### Description

redis.c

@@ -3954,9 +3954,9 @@ PHP_METHOD(Redis, multi)
 	int response_len, cmd_len;
 	char * response;
 	zval *object;
-	double multi_value;
+	long multi_value = REDIS_MULTI;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Od",
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l",
                                      &object, redis_ce, &multi_value) == FAILURE) {
         RETURN_FALSE;
     }
@@ -3974,11 +3974,6 @@ PHP_METHOD(Redis, multi)
 		exit(-1);
 	}
 
-    /*
-	head = malloc(sizeof(fold_item));
-	current = head;
-	current->function_name = strdup("__begin__");
-    */
     current = NULL;
 
 	IF_MULTI() {

tests/TestRedis.php

@@ -1218,6 +1218,7 @@ public function testlGetRange() {
 	$this->assertEquals($this->redis->lGetRange('list', 0, -1), array());
     }
 
+    /*
     public function testsave() {
 	$this->assertTrue($this->redis->save() === TRUE);	// don't really know how else to test this...
     }
@@ -1240,7 +1241,8 @@ public function testlastSave() {
 
 	$this->assertTrue($t_php - $t_redis < 10000); // check that it's approximately what we've measured in PHP.
     }
-
+     */
+/*
     public function testflushDb() {
 	$this->redis->set('x', 'y');
 	$this->assertTrue($this->redis->flushDb());
@@ -1252,7 +1254,7 @@ public function testflushAll() {
 	$this->assertTrue($this->redis->flushAll());
 	$this->assertTrue($this->redis->getKeys('*') === array());
     }
-
+*/
     public function testdbSize() {
 	$this->assertTrue($this->redis->flushDB());
 	$this->redis->set('x', 'y');
@@ -2082,6 +2084,17 @@ protected function sequence($mode) {
 	    $this->assertTrue($ret[$i++] === FALSE); // member isn't a number → fail.
 	    $this->assertTrue(count($ret) === $i);
 
+	    $ret = $this->redis->multi() // default to MULTI, not PIPELINE.
+		    ->delete('test')
+		    ->set('test', 'xyz')
+		    ->get('test')
+		    ->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++] === 'xyz');
+	    $this->assertTrue(count($ret) === $i);
     }
 
 }