projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge for Dmitry
[m6w6/libmemcached]
/
libmemcached
/
auto.c
diff --git
a/libmemcached/auto.c
b/libmemcached/auto.c
index 4d8cc0bdca3b37f945f6eaf6b75814171f74c6cf..c36cd92f4c969ccf0508f89b19d09a75093a1596 100644
(file)
--- a/
libmemcached/auto.c
+++ b/
libmemcached/auto.c
@@
-22,7
+22,7
@@
static memcached_return_t text_incr_decr(memcached_st *ptr,
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
bool no_reply= ptr->flags.no_reply;
unlikely (memcached_server_count(ptr) == 0)
bool no_reply= ptr->flags.no_reply;
unlikely (memcached_server_count(ptr) == 0)
@@
-31,7
+31,7
@@
static memcached_return_t text_incr_decr(memcached_st *ptr,
if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
- server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ server_key= memcached_generate_hash
_with_redistribution
(ptr, master_key, master_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
instance= memcached_server_instance_fetch(ptr, server_key);
send_length= (size_t)snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
@@
-43,7
+43,7
@@
static memcached_return_t text_incr_decr(memcached_st *ptr,
unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- rc= memcached_do(instance, buffer, send_length,
1
);
+ rc= memcached_do(instance, buffer, send_length,
true
);
if (no_reply || rc != MEMCACHED_SUCCESS)
return rc;
if (no_reply || rc != MEMCACHED_SUCCESS)
return rc;
@@
-83,13
+83,13
@@
static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
uint64_t *value)
{
uint32_t server_key;
uint64_t *value)
{
uint32_t server_key;
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
bool no_reply= ptr->flags.no_reply;
unlikely (memcached_server_count(ptr) == 0)
return MEMCACHED_NO_SERVERS;
bool no_reply= ptr->flags.no_reply;
unlikely (memcached_server_count(ptr) == 0)
return MEMCACHED_NO_SERVERS;
- server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ server_key= memcached_generate_hash
_with_redistribution
(ptr, master_key, master_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
if (no_reply)
instance= memcached_server_instance_fetch(ptr, server_key);
if (no_reply)
@@
-112,8
+112,8
@@
static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
request.message.body.expiration= htonl((uint32_t) expiration);
if ((memcached_do(instance, request.bytes,
request.message.body.expiration= htonl((uint32_t) expiration);
if ((memcached_do(instance, request.bytes,
- sizeof(request.bytes),
0)!=
MEMCACHED_SUCCESS) ||
- (memcached_io_write(instance, key, key_length,
1
) == -1))
+ sizeof(request.bytes),
false) !=
MEMCACHED_SUCCESS) ||
+ (memcached_io_write(instance, key, key_length,
true
) == -1))
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;
{
memcached_io_reset(instance);
return MEMCACHED_WRITE_FAILURE;