projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix a bug in update_continuum
[m6w6/libmemcached]
/
libmemcached
/
memcached.c
diff --git
a/libmemcached/memcached.c
b/libmemcached/memcached.c
index b681f6cb42d9c03e6b5ab457d9a93e1d76c2620c..40f8e263e7f7f478d579de9a8e74ff26503e2fbe 100644
(file)
--- a/
libmemcached/memcached.c
+++ b/
libmemcached/memcached.c
@@
-49,14
+49,6
@@
void memcached_free(memcached_st *ptr)
free(ptr->continuum);
}
free(ptr->continuum);
}
- if (ptr->wheel)
- {
- if (ptr->call_free)
- ptr->call_free(ptr, ptr->wheel);
- else
- free(ptr->wheel);
- }
-
if (ptr->is_allocated == MEMCACHED_ALLOCATED)
{
if (ptr->call_free)
if (ptr->is_allocated == MEMCACHED_ALLOCATED)
{
if (ptr->call_free)
@@
-111,8
+103,12
@@
memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
new_clone->retry_timeout= ptr->retry_timeout;
new_clone->distribution= ptr->distribution;
new_clone->hash= ptr->hash;
new_clone->retry_timeout= ptr->retry_timeout;
new_clone->distribution= ptr->distribution;
new_clone->hash= ptr->hash;
+ new_clone->hash_continuum= ptr->hash_continuum;
new_clone->user_data= ptr->user_data;
new_clone->user_data= ptr->user_data;
+ new_clone->snd_timeout= ptr->snd_timeout;
+ new_clone->rcv_timeout= ptr->rcv_timeout;
+
new_clone->on_clone= ptr->on_clone;
new_clone->on_cleanup= ptr->on_cleanup;
new_clone->call_free= ptr->call_free;
new_clone->on_clone= ptr->on_clone;
new_clone->on_cleanup= ptr->on_cleanup;
new_clone->call_free= ptr->call_free;
@@
-121,6
+117,12
@@
memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
new_clone->get_key_failure= ptr->get_key_failure;
new_clone->delete_trigger= ptr->delete_trigger;
new_clone->get_key_failure= ptr->get_key_failure;
new_clone->delete_trigger= ptr->delete_trigger;
+ if (ptr->prefix_key[0] != 0)
+ {
+ strcpy(new_clone->prefix_key, ptr->prefix_key);
+ new_clone->prefix_key_length= ptr->prefix_key_length;
+ }
+
rc= run_distribution(new_clone);
if (rc != MEMCACHED_SUCCESS)
{
rc= run_distribution(new_clone);
if (rc != MEMCACHED_SUCCESS)
{