Merge remote-tracking branch 'mheijkoop/zintersection_optional' into feature/zintersection_optional

michael-grunder · michael-grunder · commit 7c9420dcca95 · 2013-08-14T20:18:30.000-07:00
diff --git a/redis.c b/redis.c
@@ -4304,7 +4304,7 @@ PHPAPI void generic_z_command(INTERNAL_FUNCTION_PARAMETERS, char *command, int c
 	int cmd_len, cmd_elements;
 	int free_key_output;
 
-	if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osa|as",
+	if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osa|a!s",
 					&object, redis_ce,
 					&key_output, &key_output_len, &keys_array, &weights_array, &operation, &operation_len) == FAILURE) {
 		RETURN_FALSE;
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -1971,6 +1971,20 @@ public function testZX() {
 	$this->redis->delete('key2');
 	$this->redis->delete('key3');
 
+	//test zUnion with weights and aggegration function
+	$this->redis->zadd('key1', 1, 'duplicate');
+	$this->redis->zadd('key2', 2, 'duplicate');
+	$this->redis->zUnion('keyU', array('key1','key2'), array(1,1), 'MIN');
+	$this->assertTrue($this->redis->zScore('keyU', 'duplicate')===1.0);
+	$this->redis->delete('keyU');
+
+	//now test zUnion *without* weights but with aggregrate function
+	$this->redis->zUnion('keyU', array('key1','key2'), null, 'MIN');
+	$this->assertTrue($this->redis->zScore('keyU', 'duplicate')===1.0);
+	$this->redis->delete('keyU', 'key1', 'key2');
+
+
+
 	// test integer and float weights (GitHub issue #109).
 	$this->redis->del('key1', 'key2', 'key3');
 
@@ -2087,6 +2101,10 @@ public function testZX() {
 	$this->assertTrue( 2 === $this->redis->zInter('keyI', array('key1', 'key2', 'key3'), array(1, 5, 1), 'max'));
 	$this->assertTrue(array('val3', 'val1') === $this->redis->zRange('keyI', 0, -1));
 
+	$this->redis->delete('keyI');
+	$this->assertTrue(2 === $this->redis->zInter('keyI', array('key1', 'key2', 'key3'), null, 'max'));
+	$this->assertTrue($this->redis->zScore('keyI', 'val1') === floatval(7));
+
 	// zrank, zrevrank
 	$this->redis->delete('z');
 	$this->redis->zadd('z', 1, 'one');
