Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c81a954

Browse files
michael-grundermichael-grunder
committed
Merge branch 'hotfix/ra_autorehash' into develop
Conflicts: redis_array.c
2 parents 6194d45 + f72a317 commit c81a954

File tree

2 files changed

+52
-43
lines changed

2 files changed

+52
-43
lines changed

‎redis_array.c

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
#include "redis_array.h"
3333
#include "redis_array_impl.h"
3434

35+
/* Simple macro to detect failure in a RedisArray call */
36+
#define RA_CALL_FAILED(rv, cmd) \
37+
((Z_TYPE_P(rv) == IS_BOOL && Z_BVAL_P(rv) == 0) || \
38+
(Z_TYPE_P(rv) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(rv)) == 0) || \
39+
(Z_TYPE_P(rv) == IS_LONG && Z_LVAL_P(rv) == 0 && !strcasecmp(cmd, "TYPE"))) \
40+
3541
extern zend_class_entry *redis_ce;
3642
zend_class_entry *redis_array_ce;
3743

@@ -76,41 +82,48 @@ zend_function_entry redis_array_functions[] = {
7682
{NULL, NULL, NULL}
7783
};
7884

79-
int le_redis_array;
80-
void redis_destructor_redis_array(zend_rsrc_list_entry * rsrc TSRMLS_DC)
81-
{
82-
int i;
83-
RedisArray *ra = (RedisArray*)rsrc->ptr;
85+
static void redis_array_free(RedisArray *ra) {
86+
int i;
8487

85-
/* delete Redis objects */
86-
for(i = 0; i < ra->count; ++i) {
87-
zval_dtor(ra->redis[i]);
88-
efree(ra->redis[i]);
88+
// Redis objects
89+
for(i=0;i<ra->count;i++) {
90+
zval_dtor(ra->redis[i]);
91+
efree(ra->redis[i]);
92+
efree(ra->hosts[i]);
93+
}
94+
efree(ra->redis);
95+
efree(ra->hosts);
8996

90-
/* remove host too */
91-
efree(ra->hosts[i]);
92-
}
93-
efree(ra->redis);
94-
efree(ra->hosts);
97+
/* delete hash function */
98+
if(ra->z_fun) {
99+
zval_dtor(ra->z_fun);
100+
efree(ra->z_fun);
101+
}
95102

96-
/* delete function */
97-
if(ra->z_fun) {
98-
zval_dtor(ra->z_fun);
99-
efree(ra->z_fun);
100-
}
103+
/* Distributor */
104+
if(ra->z_dist) {
105+
zval_dtor(ra->z_dist);
106+
efree(ra->z_dist);
107+
}
101108

102-
/* delete distributor */
103-
if(ra->z_dist) {
104-
zval_dtor(ra->z_dist);
105-
efree(ra->z_dist);
106-
}
109+
/* Delete pur commands */
110+
zval_dtor(ra->z_pure_cmds);
111+
efree(ra->z_pure_cmds);
112+
113+
// Free structure itself
114+
efree(ra);
115+
}
107116

108-
/* delete list of pure commands */
109-
zval_dtor(ra->z_pure_cmds);
110-
efree(ra->z_pure_cmds);
117+
int le_redis_array;
118+
void redis_destructor_redis_array(zend_rsrc_list_entry * rsrc TSRMLS_DC)
119+
{
120+
RedisArray *ra = (RedisArray*)rsrc->ptr;
111121

112-
/* free container */
113-
efree(ra);
122+
/* Free previous ring if it's set */
123+
if(ra->prev) redis_array_free(ra->prev);
124+
125+
/* Free parent array */
126+
redis_array_free(ra);
114127
}
115128

116129
/**
@@ -295,6 +308,7 @@ PHP_METHOD(RedisArray, __construct)
295308
if(ra) {
296309
ra->auto_rehash = b_autorehash;
297310
ra->connect_timeout = d_connect_timeout;
311+
if(ra->prev) ra->prev->auto_rehash = b_autorehash;
298312
#if PHP_VERSION_ID >= 50400
299313
id = zend_list_insert(ra, le_redis_array TSRMLS_CC);
300314
#else
@@ -317,7 +331,6 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
317331
HashTable *h_args;
318332

319333
int argc;
320-
int failed;
321334
zend_bool b_write_cmd = 0;
322335

323336
h_args = Z_ARRVAL_P(z_args);
@@ -381,23 +394,15 @@ ra_forward_call(INTERNAL_FUNCTION_PARAMETERS, RedisArray *ra, const char *cmd, i
381394
} else { /* call directly through. */
382395
call_user_function(&redis_ce->function_table, &redis_inst, &z_fun, return_value, argc, z_callargs TSRMLS_CC);
383396

384-
failed = 0;
385-
if((Z_TYPE_P(return_value) == IS_BOOL && Z_BVAL_P(return_value) == 0) ||
386-
(Z_TYPE_P(return_value) == IS_ARRAY && zend_hash_num_elements(Z_ARRVAL_P(return_value)) == 0) ||
387-
(Z_TYPE_P(return_value) == IS_LONG && Z_LVAL_P(return_value) == 0 && !strcasecmp(cmd, "TYPE")))
388-
389-
{
390-
failed = 1;
391-
}
392-
393397
/* check if we have an error. */
394-
if(failed && ra->prev && !b_write_cmd) { /* there was an error reading, try with prev ring. */
395-
/* ERROR, FALLBACK TO PREVIOUS RING and forward a reference to the first redis instance we were looking at. */
398+
if(RA_CALL_FAILED(return_value,cmd) && ra->prev && !b_write_cmd) { /* there was an error reading, try with prev ring. */
399+
/* ERROR, FALLBACK TO PREVIOUS RING and forward a reference to the first redis instance we were looking at. */
396400
ra_forward_call(INTERNAL_FUNCTION_PARAM_PASSTHRU, ra->prev, cmd, cmd_len, z_args, z_new_target?z_new_target:redis_inst);
397401
}
398402

399-
if(!failed && !b_write_cmd && z_new_target && ra->auto_rehash) { /* move key from old ring to new ring */
400-
ra_move_key(key, key_len, redis_inst, z_new_target TSRMLS_CC);
403+
/* Autorehash if the key was found on the previous node if this is a read command and auto rehashing is on */
404+
if(!RA_CALL_FAILED(return_value,cmd) && !b_write_cmd && z_new_target && ra->auto_rehash) { /* move key from old ring to new ring */
405+
ra_move_key(key, key_len, redis_inst, z_new_target TSRMLS_CC);
401406
}
402407
}
403408

‎redis_array_impl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ RedisArray *ra_load_array(const char *name TSRMLS_DC) {
291291
/* create RedisArray object */
292292
ra = ra_make_array(hHosts, z_fun, z_dist, hPrev, b_index, b_pconnect, l_retry_interval, b_lazy_connect, d_connect_timeout TSRMLS_CC);
293293
ra->auto_rehash = b_autorehash;
294+
if(ra->prev) ra->prev->auto_rehash = b_autorehash;
294295

295296
/* cleanup */
296297
zval_dtor(z_params_hosts);
@@ -626,6 +627,7 @@ ra_index_key(const char *key, int key_len, zval *z_redis TSRMLS_DC) {
626627

627628
/* don't dtor z_ret, since we're returning z_redis */
628629
efree(z_args[0]);
630+
zval_dtor(z_args[1]);
629631
efree(z_args[1]);
630632
}
631633

@@ -988,6 +990,7 @@ ra_move_string(const char *key, int key_len, zval *z_from, zval *z_to, long ttl
988990
ZVAL_STRINGL(z_args[0], key, key_len, 0);
989991
ZVAL_LONG(z_args[1], ttl);
990992
ZVAL_STRINGL(z_args[2], Z_STRVAL(z_ret), Z_STRLEN(z_ret), 1); /* copy z_ret to arg 1 */
993+
zval_dtor(&z_ret); /* free memory from our previous call */
991994
call_user_function(&redis_ce->function_table, &z_to, &z_fun_set, &z_ret, 3, z_args TSRMLS_CC);
992995
/* cleanup */
993996
efree(z_args[1]);
@@ -998,6 +1001,7 @@ ra_move_string(const char *key, int key_len, zval *z_from, zval *z_to, long ttl
9981001
ZVAL_STRINGL(&z_fun_set, "SET", 3, 0);
9991002
ZVAL_STRINGL(z_args[0], key, key_len, 0);
10001003
ZVAL_STRINGL(z_args[1], Z_STRVAL(z_ret), Z_STRLEN(z_ret), 1); /* copy z_ret to arg 1 */
1004+
zval_dtor(&z_ret); /* free memory from our previous return value */
10011005
call_user_function(&redis_ce->function_table, &z_to, &z_fun_set, &z_ret, 2, z_args TSRMLS_CC);
10021006
/* cleanup */
10031007
zval_dtor(z_args[1]);

0 commit comments

Comments
 (0)