memcached_storage_action_t verb);
static inline memcached_return_t memcached_send(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *group_key, size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
{
bool to_write;
size_t write_length;
- memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
memcached_server_write_instance_st instance;
WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
+ memcached_return_t rc;
+ if ((rc= initialize_query(ptr)) != MEMCACHED_SUCCESS)
+ {
+ return rc;
+ }
+
rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol);
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
- unlikely (memcached_server_count(ptr) == 0)
- return MEMCACHED_NO_SERVERS;
-
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_with_redistribution(ptr, master_key, master_key_length);
+ server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
WATCHPOINT_SET(instance->io_wait_count.read= 0);
check_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"%s %.*s%.*s %u %llu %lu %llu%s\r\n",
storage_op_string(verb),
- (int)ptr->prefix_key_length,
- ptr->prefix_key,
+ memcached_print_array(ptr->prefix_key),
(int)key_length, key, flags,
(unsigned long long)expiration, (unsigned long)value_length,
(unsigned long long)cas,
memcpy(buffer_ptr, command, strlen(command));
/* Copy in the key prefix, switch to the buffer_ptr */
- buffer_ptr= memcpy((buffer_ptr + strlen(command)), ptr->prefix_key, ptr->prefix_key_length);
+ buffer_ptr= memcpy((buffer_ptr + strlen(command)), memcached_array_string(ptr->prefix_key), memcached_array_size(ptr->prefix_key));
/* Copy in the key, adjust point if a key prefix was used. */
- buffer_ptr= memcpy(buffer_ptr + (ptr->prefix_key_length ? ptr->prefix_key_length : 0),
+ buffer_ptr= memcpy(buffer_ptr + memcached_array_size(ptr->prefix_key),
key, key_length);
buffer_ptr+= key_length;
buffer_ptr[0]= ' ';
}
memcached_return_t memcached_set_by_key(memcached_st *ptr,
- const char *master_key __attribute__((unused)),
- size_t master_key_length __attribute__((unused)),
+ const char *group_key,
+ size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
{
memcached_return_t rc;
LIBMEMCACHED_MEMCACHED_SET_START();
- rc= memcached_send(ptr, master_key, master_key_length,
+ rc= memcached_send(ptr, group_key, group_key_length,
key, key_length, value, value_length,
expiration, flags, 0, SET_OP);
LIBMEMCACHED_MEMCACHED_SET_END();
}
memcached_return_t memcached_add_by_key(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *group_key, size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
{
memcached_return_t rc;
LIBMEMCACHED_MEMCACHED_ADD_START();
- rc= memcached_send(ptr, master_key, master_key_length,
+ rc= memcached_send(ptr, group_key, group_key_length,
key, key_length, value, value_length,
expiration, flags, 0, ADD_OP);
LIBMEMCACHED_MEMCACHED_ADD_END();
}
memcached_return_t memcached_replace_by_key(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *group_key, size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
{
memcached_return_t rc;
LIBMEMCACHED_MEMCACHED_REPLACE_START();
- rc= memcached_send(ptr, master_key, master_key_length,
+ rc= memcached_send(ptr, group_key, group_key_length,
key, key_length, value, value_length,
expiration, flags, 0, REPLACE_OP);
LIBMEMCACHED_MEMCACHED_REPLACE_END();
}
memcached_return_t memcached_prepend_by_key(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *group_key, size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
uint32_t flags)
{
memcached_return_t rc;
- rc= memcached_send(ptr, master_key, master_key_length,
+ rc= memcached_send(ptr, group_key, group_key_length,
key, key_length, value, value_length,
expiration, flags, 0, PREPEND_OP);
return rc;
}
memcached_return_t memcached_append_by_key(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *group_key, size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
uint32_t flags)
{
memcached_return_t rc;
- rc= memcached_send(ptr, master_key, master_key_length,
+ rc= memcached_send(ptr, group_key, group_key_length,
key, key_length, value, value_length,
expiration, flags, 0, APPEND_OP);
return rc;
}
memcached_return_t memcached_cas_by_key(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *group_key, size_t group_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
uint64_t cas)
{
memcached_return_t rc;
- rc= memcached_send(ptr, master_key, master_key_length,
+ rc= memcached_send(ptr, group_key, group_key_length,
key, key_length, value, value_length,
expiration, flags, cas, CAS_OP);
return rc;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= get_com_code(verb, noreply);
- request.message.header.request.keylen= htons((uint16_t)(key_length + ptr->prefix_key_length));
+ request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->prefix_key)));
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
if (verb == APPEND_OP || verb == PREPEND_OP)
send_length -= 8; /* append & prepend does not contain extras! */
request.message.body.expiration= htonl((uint32_t)expiration);
}
- request.message.header.request.bodylen= htonl((uint32_t) (key_length + ptr->prefix_key_length + value_length +
+ request.message.header.request.bodylen= htonl((uint32_t) (key_length + memcached_array_size(ptr->prefix_key) + value_length +
request.message.header.request.extlen));
if (cas)
struct libmemcached_io_vector_st vector[]=
{
{ .length= send_length, .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, .buffer= key },
{ .length= value_length, .buffer= value }
};
projects / awesomized / libmemcached / blobdiff