projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added missing constant.
[m6w6/libmemcached]
/
libmemcached
/
get.c
diff --git
a/libmemcached/get.c
b/libmemcached/get.c
index a7d0ebc6fe457c7f9c153a514cb00fd04df5c811..1df6247cbbcf6b3f6d12af8e63de03aa5793e655 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)
{
- u
nsigned in
t x;
+ u
int32_
t x;
memcached_return_t rc= MEMCACHED_NOTFOUND;
const char *get_command= "get ";
uint8_t get_command_length= 4;
memcached_return_t rc= MEMCACHED_NOTFOUND;
const char *get_command= "get ";
uint8_t get_command_length= 4;
@@
-169,7
+169,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
{
if (ptr->flags.verify_key && (memcached_key_test((const char * const *)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
{
if (ptr->flags.verify_key && (memcached_key_test((const char * const *)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
- master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ master_server_key= memcached_generate_hash
_with_redistribution
(ptr, master_key, master_key_length);
is_master_key_set= true;
}
is_master_key_set= true;
}
@@
-181,7
+181,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
*/
for (x= 0; x < memcached_server_count(ptr); x++)
{
*/
for (x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance))
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance))
@@
-189,7
+189,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
if (ptr->flags.no_block)
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
if (ptr->flags.no_block)
- (void)memcached_io_write(instance, NULL, 0,
1
);
+ (void)memcached_io_write(instance, NULL, 0,
true
);
while(memcached_server_response_count(instance))
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
while(memcached_server_response_count(instance))
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
@@
-212,7
+212,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
*/
for (x= 0; x < number_of_keys; x++)
{
*/
for (x= 0; x < number_of_keys; x++)
{
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
uint32_t server_key;
if (is_master_key_set)
uint32_t server_key;
if (is_master_key_set)
@@
-221,7
+221,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
}
else
{
}
else
{
- server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+ server_key= memcached_generate_hash
_with_redistribution
(ptr, keys[x], key_length[x]);
}
instance= memcached_server_instance_fetch(ptr, server_key);
}
instance= memcached_server_instance_fetch(ptr, server_key);
@@
-233,7
+233,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
if (rc != MEMCACHED_SUCCESS)
continue;
if (rc != MEMCACHED_SUCCESS)
continue;
- if ((memcached_io_write(instance, get_command, get_command_length,
0
)) == -1)
+ if ((memcached_io_write(instance, get_command, get_command_length,
false
)) == -1)
{
rc= MEMCACHED_SOME_ERRORS;
continue;
{
rc= MEMCACHED_SOME_ERRORS;
continue;
@@
-246,7
+246,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
/* Only called when we have a prefix key */
if (ptr->prefix_key_length)
{
/* Only called when we have a prefix key */
if (ptr->prefix_key_length)
{
- if ((memcached_io_write(instance, ptr->prefix_key, ptr->prefix_key_length,
0
)) == -1)
+ if ((memcached_io_write(instance, ptr->prefix_key, ptr->prefix_key_length,
false
)) == -1)
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
@@
-254,14
+254,14
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
}
}
}
}
- if ((memcached_io_write(instance, keys[x], key_length[x],
0
)) == -1)
+ if ((memcached_io_write(instance, keys[x], key_length[x],
false
)) == -1)
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
continue;
}
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
continue;
}
- if ((memcached_io_write(instance, " ", 1,
0
)) == -1)
+ if ((memcached_io_write(instance, " ", 1,
false
)) == -1)
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
@@
-274,13
+274,13
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
*/
for (x= 0; x < memcached_server_count(ptr); x++)
{
*/
for (x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance))
{
/* We need to do something about non-connnected hosts in the future */
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance))
{
/* We need to do something about non-connnected hosts in the future */
- if ((memcached_io_write(instance, "\r\n", 2,
1
)) == -1)
+ if ((memcached_io_write(instance, "\r\n", 2,
true
)) == -1)
{
rc= MEMCACHED_SOME_ERRORS;
}
{
rc= MEMCACHED_SOME_ERRORS;
}
@@
-362,7
+362,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
for (x= 0; x < number_of_keys; x++)
{
uint32_t server_key;
for (x= 0; x < number_of_keys; x++)
{
uint32_t server_key;
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
if (is_master_key_set)
{
if (is_master_key_set)
{
@@
-370,7
+370,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
}
else
{
}
else
{
- server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+ server_key= memcached_generate_hash
_with_redistribution
(ptr, keys[x], key_length[x]);
}
instance= memcached_server_instance_fetch(ptr, server_key);
}
instance= memcached_server_instance_fetch(ptr, server_key);
@@
-407,9
+407,9
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
if ((memcached_io_write(instance, request.bytes,
request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
if ((memcached_io_write(instance, request.bytes,
- sizeof(request.bytes),
0
) == -1) ||
+ sizeof(request.bytes),
false
) == -1) ||
(memcached_io_write(instance, keys[x],
(memcached_io_write(instance, keys[x],
- key_length[x],
(char)
flush) == -1))
+ key_length[x], flush) == -1))
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
@@
-436,12
+436,12
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
for (x= 0; x < memcached_server_count(ptr); x++)
{
for (x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance))
{
memcached_server_instance_fetch(ptr, x);
if (memcached_server_response_count(instance))
{
- if (memcached_io_write(instance, NULL, 0,
1
) == -1)
+ if (memcached_io_write(instance, NULL, 0,
true
) == -1)
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
@@
-449,7
+449,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
}
if (memcached_io_write(instance, request.bytes,
}
if (memcached_io_write(instance, request.bytes,
- sizeof(request.bytes),
1
) == -1)
+ sizeof(request.bytes),
true
) == -1)
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
@@
-484,7
+484,7
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
for (x= 0; x < number_of_keys; ++x)
{
for (x= 0; x < number_of_keys; ++x)
{
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
if (hash[x] == memcached_server_count(ptr))
continue; /* Already successfully sent */
if (hash[x] == memcached_server_count(ptr))
continue; /* Already successfully sent */
@@
-536,9
+536,9
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
* just make sure we work _correctly_
*/
if ((memcached_io_write(instance, request.bytes,
* just make sure we work _correctly_
*/
if ((memcached_io_write(instance, request.bytes,
- sizeof(request.bytes),
0
) == -1) ||
+ sizeof(request.bytes),
false
) == -1) ||
(memcached_io_write(instance, keys[x],
(memcached_io_write(instance, keys[x],
- key_length[x],
1
) == -1))
+ key_length[x],
true
) == -1))
{
memcached_io_reset(instance);
dead_servers[server]= true;
{
memcached_io_reset(instance);
dead_servers[server]= true;
@@
-588,11
+588,19
@@
static memcached_return_t 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 (size_t x= 0; x < number_of_keys; x++)
+ {
hash[x]= master_server_key;
hash[x]= master_server_key;
+ }
+ }
else
else
- for (unsigned int x= 0; x < number_of_keys; x++)
- hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
+ {
+ for (size_t x= 0; x < number_of_keys; x++)
+ {
+ hash[x]= memcached_generate_hash_with_redistribution(ptr, keys[x], key_length[x]);
+ }
+ }
rc= replication_binary_mget(ptr, hash, dead_servers, keys,
key_length, number_of_keys);
rc= replication_binary_mget(ptr, hash, dead_servers, keys,
key_length, number_of_keys);