projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove sample.cnf
[m6w6/libmemcached]
/
libmemcached
/
get.c
diff --git
a/libmemcached/get.c
b/libmemcached/get.c
index 8d76507cd29dbd1564b6d6b12617f5efa4a4679f..7cb5ec0473a02dee239104d60ed32b92403e8bb0 100644
(file)
--- a/
libmemcached/get.c
+++ b/
libmemcached/get.c
@@
-144,7
+144,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
size_t number_of_keys,
bool mget_mode)
{
size_t number_of_keys,
bool mget_mode)
{
-
memcached_return_t rc= MEMCACHED_NOTFOUND
;
+
bool failures_occured_in_sending= false
;
const char *get_command= "get ";
uint8_t get_command_length= 4;
unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
const char *get_command= "get ";
uint8_t get_command_length= 4;
unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
@@
-211,6
+211,8
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
If a server fails we warn about errors and start all over with sending keys
to the server.
*/
If a server fails we warn about errors and start all over with sending keys
to the server.
*/
+ memcached_return_t rc= MEMCACHED_SUCCESS;
+ size_t hosts_connected= 0;
for (uint32_t x= 0; x < number_of_keys; x++)
{
memcached_server_write_instance_st instance;
for (uint32_t x= 0; x < number_of_keys; x++)
{
memcached_server_write_instance_st instance;
@@
-230,7
+232,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
struct libmemcached_io_vector_st vector[]=
{
{ .length= get_command_length, .buffer= get_command },
struct libmemcached_io_vector_st vector[]=
{
{ .length= get_command_length, .buffer= get_command },
- { .length=
ptr->prefix_key_length, .buffer= ptr->prefix_key
},
+ { .length=
memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key)
},
{ .length= key_length[x], .buffer= keys[x] },
{ .length= 1, .buffer= " " }
};
{ .length= key_length[x], .buffer= keys[x] },
{ .length= 1, .buffer= " " }
};
@@
-241,11
+243,14
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
rc= memcached_connect(instance);
if (rc != MEMCACHED_SUCCESS)
rc= memcached_connect(instance);
if (rc != MEMCACHED_SUCCESS)
+ {
continue;
continue;
+ }
+ hosts_connected++;
if ((memcached_io_writev(instance, vector, 4, false)) == -1)
{
if ((memcached_io_writev(instance, vector, 4, false)) == -1)
{
-
rc= MEMCACHED_SOME_ERRORS
;
+
failures_occured_in_sending= true
;
continue;
}
WATCHPOINT_ASSERT(instance->cursor_active == 0);
continue;
}
WATCHPOINT_ASSERT(instance->cursor_active == 0);
@@
-257,15
+262,27
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
if ((memcached_io_writev(instance, (vector + 1), 3, false)) == -1)
{
memcached_server_response_reset(instance);
if ((memcached_io_writev(instance, (vector + 1), 3, false)) == -1)
{
memcached_server_response_reset(instance);
-
rc= MEMCACHED_SOME_ERRORS
;
+
failures_occured_in_sending= true
;
continue;
}
}
}
continue;
}
}
}
+ if (hosts_connected == 0)
+ {
+ LIBMEMCACHED_MEMCACHED_MGET_END();
+
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
+
+ return MEMCACHED_NO_SERVERS;
+ }
+
+
/*
Should we muddle on if some servers are dead?
*/
/*
Should we muddle on if some servers are dead?
*/
+ bool success_happened= false;
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
memcached_server_write_instance_st instance=
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
memcached_server_write_instance_st instance=
@@
-276,13
+293,24
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
/* We need to do something about non-connnected hosts in the future */
if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
{
/* We need to do something about non-connnected hosts in the future */
if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
{
- rc= MEMCACHED_SOME_ERRORS;
+ failures_occured_in_sending= true;
+ }
+ else
+ {
+ success_happened= true;
}
}
}
LIBMEMCACHED_MEMCACHED_MGET_END();
}
}
}
LIBMEMCACHED_MEMCACHED_MGET_END();
- return rc;
+
+ if (failures_occured_in_sending && success_happened)
+ return MEMCACHED_SOME_ERRORS;
+
+ if (success_happened)
+ return MEMCACHED_SUCCESS;
+
+ return MEMCACHED_FAILURE;
}
memcached_return_t memcached_mget_by_key(memcached_st *ptr,
}
memcached_return_t memcached_mget_by_key(memcached_st *ptr,
@@
-346,7
+374,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
{
memcached_return_t rc= MEMCACHED_NOTFOUND;
{
memcached_return_t rc= MEMCACHED_NOTFOUND;
-
int flush= number_of_keys == 1
;
+
bool flush= (number_of_keys == 1)
;
/*
If a server fails we warn about errors and start all over with sending keys
/*
If a server fails we warn about errors and start all over with sending keys
@@
-395,14
+423,14
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
return vk;
}
return vk;
}
- request.message.header.request.keylen= htons((uint16_t)(key_length[x] +
ptr->prefix_key_length
));
+ request.message.header.request.keylen= htons((uint16_t)(key_length[x] +
memcached_array_size(ptr->prefix_key)
));
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] +
ptr->prefix_key_length
));
+ request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] +
memcached_array_size(ptr->prefix_key)
));
struct libmemcached_io_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
struct libmemcached_io_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
- { .length=
ptr->prefix_key_length, .buffer= ptr->prefix_key
},
+ { .length=
memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key)
},
{ .length= key_length[x], .buffer= keys[x] }
};
{ .length= key_length[x], .buffer= keys[x] }
};
@@
-517,9
+545,9
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
.message.header.request= {
.magic= PROTOCOL_BINARY_REQ,
.opcode= PROTOCOL_BINARY_CMD_GETK,
.message.header.request= {
.magic= PROTOCOL_BINARY_REQ,
.opcode= PROTOCOL_BINARY_CMD_GETK,
- .keylen= htons((uint16_t)(key_length[x] +
ptr->prefix_key_length
)),
+ .keylen= htons((uint16_t)(key_length[x] +
memcached_array_size(ptr->prefix_key)
)),
.datatype= PROTOCOL_BINARY_RAW_BYTES,
.datatype= PROTOCOL_BINARY_RAW_BYTES,
- .bodylen= htonl((uint32_t)(key_length[x] +
ptr->prefix_key_length
))
+ .bodylen= htonl((uint32_t)(key_length[x] +
memcached_array_size(ptr->prefix_key)
))
}
};
}
};
@@
-536,7
+564,7
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
struct libmemcached_io_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
struct libmemcached_io_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
- { .length=
ptr->prefix_key_length, .buffer= ptr->prefix_key
},
+ { .length=
memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key)
},
{ .length= key_length[x], .buffer= keys[x] }
};
{ .length= key_length[x], .buffer= keys[x] }
};