projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging replication
[m6w6/libmemcached]
/
libmemcached
/
memcached_get.c
diff --git
a/libmemcached/memcached_get.c
b/libmemcached/memcached_get.c
index cdae9922bcb3acda7316edf9b4325516f1800a05..0209b283ab1129ec5b53347e91d1420ca2366e36 100644
(file)
--- a/
libmemcached/memcached_get.c
+++ b/
libmemcached/memcached_get.c
@@
-449,9
+449,8
@@
static memcached_return replication_binary_mget(memcached_st *ptr,
}
}
}
}
- if (success)
{
+ if (success)
break;
break;
- }
}
return rc;
}
return rc;
@@
-469,7
+468,9
@@
static memcached_return binary_mget_by_key(memcached_st *ptr,
{
rc= simple_binary_mget(ptr, master_server_key, is_master_key_set,
keys, key_length, number_of_keys);
{
rc= simple_binary_mget(ptr, master_server_key, is_master_key_set,
keys, key_length, number_of_keys);
- } else {
+ }
+ else
+ {
uint32_t* hash;
bool* dead_servers;
uint32_t* hash;
bool* dead_servers;
@@
-484,10
+485,10
@@
static memcached_return binary_mget_by_key(memcached_st *ptr,
}
if (is_master_key_set)
}
if (is_master_key_set)
- for (unsigned int x= 0; x < number_of_keys;
++x
)
+ for (unsigned int x= 0; x < number_of_keys;
x++
)
hash[x]= master_server_key;
else
hash[x]= master_server_key;
else
- for (unsigned int x= 0; x < number_of_keys;
++x
)
+ for (unsigned int x= 0; x < number_of_keys;
x++
)
hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
rc= replication_binary_mget(ptr, hash, dead_servers, keys,
hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
rc= replication_binary_mget(ptr, hash, dead_servers, keys,