RedisArray fixes

michael-grunder · michael-grunder · commit 889b2f2e9c55 · 2012-06-22T17:07:34.000-07:00
I created this branch to go through issues raised by @seansawyer regarding RedisArray functionality. The first commit addresses issue phpredis#205 (KEYS) command. More investigation is required for the two other issues raised.
diff --git a/redis_array.c b/redis_array.c
@@ -58,6 +58,7 @@ zend_function_entry redis_array_functions[] = {
      PHP_ME(RedisArray, del, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(RedisArray, getOption, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(RedisArray, setOption, NULL, ZEND_ACC_PUBLIC)
+     PHP_ME(RedisArray, keys, NULL, ZEND_ACC_PUBLIC)
 
 	 /* Multi/Exec */
      PHP_ME(RedisArray, multi, NULL, ZEND_ACC_PUBLIC)
@@ -553,6 +554,51 @@ PHP_METHOD(RedisArray, ping)
 	multihost_distribute(INTERNAL_FUNCTION_PARAM_PASSTHRU, "PING");
 }
 
+PHP_METHOD(RedisArray, keys)
+{
+	zval *object, *z_args[1], *z_tmp, z_fun;
+	RedisArray *ra;
+	char *pattern;
+	int pattern_len, i;
+
+	// Make sure the prototype is correct
+	if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os",
+								    &object, redis_array_ce, &pattern, &pattern_len) == FAILURE)
+	{
+		RETURN_FALSE;
+	}
+
+	// Make sure we can grab our RedisArray object
+	if(redis_array_get(object, &ra TSRMLS_CC) < 0) {
+		RETURN_FALSE;
+	}
+
+	// Set up our function call (KEYS)
+	ZVAL_STRING(&z_fun, "KEYS", 0);
+
+	// We will be passing with one string argument (the pattern)
+	MAKE_STD_ZVAL(z_args[0]);
+	ZVAL_STRINGL(z_args[0], pattern, pattern_len, 0);
+
+	// Init our array return
+	array_init(return_value);
+
+	// Iterate our RedisArray nodes
+	for(i=0; i<ra->count; ++i) {
+		// Return for this node
+		MAKE_STD_ZVAL(z_tmp);
+
+		// Call KEYS on each node
+		call_user_function(&redis_ce->function_table, &ra->redis[i], &z_fun, z_tmp, 1, z_args TSRMLS_CC);
+
+		// Add the result for this host
+		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
+	}
+
+	// Free arg array
+	efree(z_args[0]);
+}
+
 PHP_METHOD(RedisArray, getOption)
 {
 	zval *object, z_fun, *z_tmp, *z_args[1];
diff --git a/redis_array.h b/redis_array.h
@@ -20,6 +20,7 @@ PHP_METHOD(RedisArray, ping);
 PHP_METHOD(RedisArray, mget);
 PHP_METHOD(RedisArray, mset);
 PHP_METHOD(RedisArray, del);
+PHP_METHOD(RedisArray, keys);
 PHP_METHOD(RedisArray, getOption);
 PHP_METHOD(RedisArray, setOption);
 
