} memcached_storage_action;
/* Inline this */
-char *storage_op_string(memcached_storage_action verb)
+static char *storage_op_string(memcached_storage_action verb)
{
switch (verb)
{
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags,
+ uint32_t flags,
uint64_t cas,
memcached_storage_action verb)
{
if (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ return MEMCACHED_BAD_KEY_PROVIDED;
+
server_key= memcached_generate_hash(ptr, master_key, master_key_length);
if (cas)
goto error;
}
- rc= memcached_do(ptr, server_key, buffer, write_length, 0);
+ rc= memcached_do(&ptr->hosts[server_key], buffer, write_length, 0);
if (rc != MEMCACHED_SUCCESS)
goto error;
- if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1)
+ if ((sent_length= memcached_io_write(&ptr->hosts[server_key], value, value_length, 0)) == -1)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
- if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+ if ((ptr->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP)
to_write= 0;
else
to_write= 1;
- if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1)
+ if ((sent_length= memcached_io_write(&ptr->hosts[server_key], "\r\n", 2, to_write)) == -1)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
if (to_write == 0)
- {
- rc= MEMCACHED_SUCCESS;
- memcached_server_response_increment(ptr, server_key);
- }
- else
- {
- rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
- }
+ return MEMCACHED_BUFFERED;
+
+ rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+
if (rc == MEMCACHED_STORED)
return MEMCACHED_SUCCESS;
else
return rc;
error:
- memcached_io_reset(ptr, server_key);
+ memcached_io_reset(&ptr->hosts[server_key]);
return rc;
}
memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_SET_START();
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_ADD_START();
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_REPLACE_START();
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
rc= memcached_send(ptr, key, key_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
rc= memcached_send(ptr, key, key_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags,
+ uint32_t flags,
uint64_t cas)
{
memcached_return rc;
rc= memcached_send(ptr, key, key_length,
key, key_length, value, value_length,
- expiration, flags, cas, APPEND_OP);
+ expiration, flags, cas, CAS_OP);
return rc;
}
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_SET_START();
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_ADD_START();
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_REPLACE_START();
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
rc= memcached_send(ptr, key, key_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags)
+ uint32_t flags)
{
memcached_return rc;
rc= memcached_send(ptr, key, key_length,
char *key, size_t key_length,
char *value, size_t value_length,
time_t expiration,
- uint16_t flags,
+ uint32_t flags,
uint64_t cas)
{
memcached_return rc;
rc= memcached_send(ptr, key, key_length,
key, key_length, value, value_length,
- expiration, flags, cas, APPEND_OP);
+ expiration, flags, cas, CAS_OP);
return rc;
}