*error= memcached_mget_by_key(ptr,
master_key,
master_key_length,
- (char **)&key, &key_length, 1);
+ (const char **)&key, &key_length, 1);
value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
{
if (rc == MEMCACHED_BUFFERED)
{
- uint8_t latch; /* We use latch to track the state of the original socket */
+ uint64_t latch; /* We use latch to track the state of the original socket */
latch= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS);
if (latch == 0)
memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1);
}
memcached_return memcached_mget(memcached_st *ptr,
- char **keys, size_t *key_length,
- unsigned int number_of_keys)
+ const char **keys, size_t *key_length,
+ size_t number_of_keys)
{
return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys);
}
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
- char **keys, size_t *key_length,
- unsigned int number_of_keys);
+ const char **keys, size_t *key_length,
+ size_t number_of_keys);
memcached_return memcached_mget_by_key(memcached_st *ptr,
const char *master_key,
size_t master_key_length,
- char **keys,
+ const char **keys,
size_t *key_length,
- unsigned int number_of_keys)
+ size_t number_of_keys)
{
unsigned int x;
memcached_return rc= MEMCACHED_NOTFOUND;
- char *get_command= "get ";
+ 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! */
bool is_master_key_set= false;
if (master_key && master_key_length)
{
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((const char **)&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);
is_master_key_set= true;
static memcached_return simple_binary_mget(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
- char **keys, size_t *key_length,
- unsigned int number_of_keys)
+ const char **keys, size_t *key_length,
+ size_t number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
uint32_t x;
request.message.header.request.keylen= htons((uint16_t)key_length[x]);
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl(key_length[x]);
+ request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
if ((memcached_io_write(&ptr->hosts[server_key], request.bytes,
sizeof(request.bytes), 0) == -1) ||
(memcached_io_write(&ptr->hosts[server_key], keys[x],
- key_length[x], flush) == -1))
+ key_length[x], (char) flush) == -1))
{
memcached_server_response_reset(&ptr->hosts[server_key]);
rc= MEMCACHED_SOME_ERRORS;
static memcached_return replication_binary_mget(memcached_st *ptr,
uint32_t* hash, bool* dead_servers,
- char **keys, size_t *key_length,
- unsigned int number_of_keys)
+ const char **keys, size_t *key_length,
+ size_t number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
uint32_t x;
int flush= number_of_keys == 1;
- for (int replica = 0; replica <= ptr->number_of_replicas; ++replica)
+ for (uint32_t replica= 0; replica <= ptr->number_of_replicas; ++replica)
{
bool success= true;
- for (uint32_t x= 0; x < number_of_keys; ++x)
+ for (x= 0; x < number_of_keys; ++x)
{
if (hash[x] == ptr->number_of_hosts)
continue; /* Already successfully sent */
request.message.header.request.keylen= htons((uint16_t)key_length[x]);
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl(key_length[x]);
+ request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
if ((memcached_io_write(&ptr->hosts[server], request.bytes,
sizeof(request.bytes), 0) == -1) ||
(memcached_io_write(&ptr->hosts[server], keys[x],
- key_length[x], flush) == -1))
+ key_length[x], (char) flush) == -1))
{
memcached_io_reset(&ptr->hosts[server]);
dead_servers[server]= true;
memcached_server_response_increment(&ptr->hosts[x]);
/* mark all of the messages bound for this server as sent! */
- for (uint32_t x= 0; x < number_of_keys; ++x)
+ for (x= 0; x < number_of_keys; ++x)
if (hash[x] == x)
hash[x]= ptr->number_of_hosts;
}
}
- if (success) {
+ if (success)
break;
- }
}
return rc;
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
bool is_master_key_set,
- char **keys, size_t *key_length,
- unsigned int number_of_keys)
+ const char **keys, size_t *key_length,
+ size_t number_of_keys)
{
memcached_return rc;
{
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;
- if (ptr->call_malloc)
- {
- hash= ptr->call_malloc(ptr, sizeof(uint32_t) * number_of_keys);
- dead_servers= ptr->call_malloc(ptr, sizeof(bool) * ptr->number_of_hosts);
- }
- else
- {
- hash = malloc(sizeof(uint32_t) * number_of_keys);
- dead_servers= malloc(sizeof(bool) * ptr->number_of_hosts);
- }
+ hash= ptr->call_malloc(ptr, sizeof(uint32_t) * number_of_keys);
+ dead_servers= ptr->call_calloc(ptr, ptr->number_of_hosts, sizeof(bool));
if (hash == NULL || dead_servers == NULL)
{
- if (ptr->call_free)
- {
- if (hash != NULL) ptr->call_free(ptr, hash);
- if (dead_servers != NULL) ptr->call_free(ptr, dead_servers);
- }
- else
- {
- free(hash); /* No need to check for NULL (just look in the C spec) */
- free(dead_servers);
- }
+ ptr->call_free(ptr, hash);
+ ptr->call_free(ptr, dead_servers);
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
}
- memset(dead_servers, 0, sizeof(bool) * ptr->number_of_hosts);
-
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
- 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, key_length, number_of_keys);
+ rc= replication_binary_mget(ptr, hash, dead_servers, keys,
+ key_length, number_of_keys);
- if (ptr->call_free)
- {
- ptr->call_free(ptr, hash);
- ptr->call_free(ptr, dead_servers);
- }
- else
- {
- free(hash);
- free(dead_servers);
- }
+ ptr->call_free(ptr, hash);
+ ptr->call_free(ptr, dead_servers);
return MEMCACHED_SUCCESS;
}
projects / m6w6 / libmemcached / blobdiff