From 9ba000c54cc47d470366c59af87ddf9d4dd454bc Mon Sep 17 00:00:00 2001
From: Emmanuel Merali <emmanuel@mobli.com>
Date: Tue, 29 Jan 2013 11:40:06 +0200
Subject: Revert "Retry delay - selectDB on array"

This reverts commit 3fb643211e524112bd9a19792f833b12b68de600.
---
 redis_array.c | 57 +--------------------------------------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

(limited to 'redis_array.c')

diff --git a/redis_array.c b/redis_array.c
index be95c50d..d0460f10 100644
--- a/redis_array.c
+++ b/redis_array.c
@@ -51,7 +51,6 @@ zend_function_entry redis_array_functions[] = {
      PHP_ME(RedisArray, _rehash, NULL, ZEND_ACC_PUBLIC)
 
      /* special implementation for a few functions */
-     PHP_ME(RedisArray, select, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(RedisArray, info, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(RedisArray, ping, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(RedisArray, mget, NULL, ZEND_ACC_PUBLIC)
@@ -193,7 +192,6 @@ PHP_METHOD(RedisArray, __construct)
 	RedisArray *ra = NULL;
 	zend_bool b_index = 0, b_autorehash = 0;
 	HashTable *hPrev = NULL, *hOpts = NULL;
-  long l_retry_interval = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|a", &z0, &z_opts) == FAILURE) {
 		RETURN_FALSE;
@@ -234,19 +232,6 @@ PHP_METHOD(RedisArray, __construct)
 		if(FAILURE != zend_hash_find(hOpts, "autorehash", sizeof("autorehash"), (void**)&zpData) && Z_TYPE_PP(zpData) == IS_BOOL) {
 			b_autorehash = Z_BVAL_PP(zpData);
 		}
-
-		/* extract retry_interval option. */
-    zval **z_retry_interval_pp;
-		if (FAILURE != zend_hash_find(hOpts, "retry_interval", sizeof("retry_interval"), (void**)&z_retry_interval_pp)) {
-			if (Z_TYPE_PP(z_retry_interval_pp) == IS_LONG || Z_TYPE_PP(z_retry_interval_pp) == IS_STRING) {
-				if (Z_TYPE_PP(z_retry_interval_pp) == IS_LONG) {
-					l_retry_interval = Z_LVAL_PP(z_retry_interval_pp);
-				}
-				else {
-					l_retry_interval = atol(Z_STRVAL_PP(z_retry_interval_pp));
-				}
-			}
-		}
 	}
 
 	/* extract either name of list of hosts from z0 */
@@ -256,7 +241,7 @@ PHP_METHOD(RedisArray, __construct)
 			break;
 
 		case IS_ARRAY:
-			ra = ra_make_array(Z_ARRVAL_P(z0), z_fun, z_dist, hPrev, b_index, l_retry_interval TSRMLS_CC);
+			ra = ra_make_array(Z_ARRVAL_P(z0), z_fun, z_dist, hPrev, b_index TSRMLS_CC);
 			break;
 
 		default:
@@ -703,46 +688,6 @@ PHP_METHOD(RedisArray, setOption)
 	efree(z_args[0]);
 	efree(z_args[1]);
 }
-
-PHP_METHOD(RedisArray, select)
-{
-	zval *object, z_fun, *z_tmp, *z_args[2];
-	int i;
-	RedisArray *ra;
-	long opt;
-
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol",
-				&object, redis_array_ce, &opt) == FAILURE) {
-		RETURN_FALSE;
-	}
-
-	if (redis_array_get(object, &ra TSRMLS_CC) < 0) {
-		RETURN_FALSE;
-	}
-
-	/* prepare call */
-	ZVAL_STRING(&z_fun, "select", 0);
-
-	/* copy args */
-	MAKE_STD_ZVAL(z_args[0]);
-	ZVAL_LONG(z_args[0], opt);
-
-	array_init(return_value);
-	for(i = 0; i < ra->count; ++i) {
-
-		MAKE_STD_ZVAL(z_tmp);
-
-		/* Call each node in turn */
-		call_user_function(&redis_ce->function_table, &ra->redis[i],
-				&z_fun, z_tmp, 1, z_args TSRMLS_CC);
-
-		add_assoc_zval(return_value, ra->hosts[i], z_tmp);
-	}
-
-	/* cleanup */
-	efree(z_args[0]);
-}
-
 #define HANDLE_MULTI_EXEC(cmd) do {\
 	if (redis_array_get(getThis(), &ra TSRMLS_CC) >= 0 && ra->z_multi_exec) {\
 		int i, num_varargs;\
-- 
cgit v1.2.3