Multi/Exec support for MGET, MSET, and DEL.

Author: nicolasff

redis_array.c

@@ -559,6 +559,29 @@ PHP_METHOD(RedisArray, setOption)
 	efree(z_args[0]);
 	efree(z_args[1]);
 }
+#define HANDLE_MULTI_EXEC(cmd) do {\
+	if (redis_array_get(getThis(), &ra TSRMLS_CC) >= 0 && ra->z_multi_exec) {\
+		int i, num_varargs;\
+		zval ***varargs = NULL;\
+		zval z_arg_array;\
+		if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O*",\
+								&object, redis_array_ce, &varargs, &num_varargs) == FAILURE) {\
+				RETURN_FALSE;\
+		}\
+		/* copy all args into a zval hash table */\
+		array_init(&z_arg_array);\
+		for(i = 0; i < num_varargs; ++i) {\
+				add_next_index_zval(&z_arg_array, *varargs[i]);\
+		}\
+		/* call */\
+		ra_forward_call(INTERNAL_FUNCTION_PARAM_PASSTHRU, ra, cmd, sizeof(cmd)-1, &z_arg_array, NULL);\
+		zval_dtor(&z_arg_array);\
+		if(varargs) {\
+			efree(varargs);\
+		}\
+		return;\
+	}\
+}while(0)
 
 /* MGET will distribute the call to several nodes and regroup the values. */
 PHP_METHOD(RedisArray, mget)
@@ -571,6 +594,9 @@ PHP_METHOD(RedisArray, mget)
 	HashPosition pointer;
 	zval **redis_instances, *redis_inst, **argv;
 
+	/* Multi/exec support */
+	HANDLE_MULTI_EXEC("MGET");
+
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa",
 				&object, redis_array_ce, &z_keys) == FAILURE) {
 		RETURN_FALSE;
@@ -691,6 +717,9 @@ PHP_METHOD(RedisArray, mset)
 	int key_len, type, *key_lens;
 	long idx;
 
+	/* Multi/exec support */
+	HANDLE_MULTI_EXEC("MSET");
+
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa",
 				&object, redis_array_ce, &z_keys) == FAILURE) {
 		RETURN_FALSE;
@@ -792,6 +821,9 @@ PHP_METHOD(RedisArray, del)
 	long total = 0;
 	int free_zkeys = 0;
 
+	/* Multi/exec support */
+	HANDLE_MULTI_EXEC("DEL");
+
 	/* get all args in z_args */
 	z_args = emalloc(ZEND_NUM_ARGS() * sizeof(zval*));
 	if(zend_get_parameters_array(ht, ZEND_NUM_ARGS(), z_args) == FAILURE) {

tests/array-rehash.php

@@ -278,6 +278,7 @@ public function testKeyDistribution() {
 
 	public function testMultiExec() {
 
+		// Joe gets a promotion
 		$newGroup = $this->ra->get('group:executives');
 		$newSalary = 4000;
 
@@ -291,6 +292,47 @@ public function testMultiExec() {
 		// check that the group and salary have been changed
 		$this->assertTrue($this->ra->get('1_{employee:joe}_group') === $newGroup);
 		$this->assertTrue($this->ra->get('1_{employee:joe}_salary') == $newSalary);
+
+	}
+
+	public function testMultiExecMSet() {
+
+		global $newGroup, $newSalary;
+		$newGroup = 1;
+		$newSalary = 10000;
+
+		// test MSET, making Joe a top-level executive
+		$out = $this->ra->multi($this->ra->_target('{employee:joe}'))
+				->mset(array('1_{employee:joe}_group' => $newGroup, '1_{employee:joe}_salary' => $newSalary))
+				->exec();
+
+		$this->assertTrue($out[0] === TRUE);
+
+	}
+
+	public function testMultiExecMGet() {
+
+		global $newGroup, $newSalary;
+
+		// test MGET
+		$out = $this->ra->multi($this->ra->_target('{employee:joe}'))
+				->mget(array('1_{employee:joe}_group', '1_{employee:joe}_salary'))
+				->exec();
+
+		$this->assertTrue($out[0][0] == $newGroup);
+		$this->assertTrue($out[0][1] == $newSalary);
+	}
+
+	public function testMultiExecDel() {
+
+		// test DEL
+		$out = $this->ra->multi($this->ra->_target('{employee:joe}'))
+				->del('1_{employee:joe}_group', '1_{employee:joe}_salary')
+				->exec();
+
+		$this->assertTrue($out[0] === 2);
+		$this->assertTrue($this->ra->exists('1_{employee:joe}_group') === FALSE);
+		$this->assertTrue($this->ra->exists('1_{employee:joe}_salary') === FALSE);
 	}
 
 }