return "set ";
}
-static inline uint8_t get_com_code(memcached_storage_action_t verb, bool noreply)
+static inline uint8_t can_by_encrypted(const memcached_storage_action_t verb)
{
- if (noreply)
+ switch (verb)
+ {
+ case SET_OP:
+ case ADD_OP:
+ case CAS_OP:
+ case REPLACE_OP:
+ return true;
+
+ case APPEND_OP:
+ case PREPEND_OP:
+ break;
+ }
+
+ return false;
+}
+
+static inline uint8_t get_com_code(const memcached_storage_action_t verb, const bool reply)
+{
+ if (reply == false)
{
switch (verb)
{
memcached_server_write_instance_st server,
uint32_t server_key,
const char *key,
- size_t key_length,
+ const size_t key_length,
const char *value,
- size_t value_length,
- time_t expiration,
- uint32_t flags,
- uint64_t cas,
- bool flush,
+ const size_t value_length,
+ const time_t expiration,
+ const uint32_t flags,
+ const uint64_t cas,
+ const bool flush,
+ const bool reply,
memcached_storage_action_t verb)
{
protocol_binary_request_set request= {};
size_t send_length= sizeof(request.bytes);
- bool noreply= server->root->flags.no_reply;
+ initialize_binary_request(server, request.message.header);
- request.message.header.request.magic= PROTOCOL_BINARY_REQ;
- request.message.header.request.opcode= get_com_code(verb, noreply);
+ request.message.header.request.opcode= get_com_code(verb, reply);
request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->_namespace)));
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
if (verb == APPEND_OP or verb == PREPEND_OP)
request.message.header.request.cas= memcached_htonll(cas);
}
- if (server->root->flags.use_udp and flush == false)
- {
- size_t cmd_size= send_length + key_length + value_length;
-
- if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
- {
- return MEMCACHED_WRITE_FAILURE;
- }
- if (cmd_size + server->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
- {
- memcached_io_write(server);
- }
- }
-
- struct libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
+ { NULL, 0 },
{ request.bytes, send_length },
{ memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
{ key, key_length },
/* write the header */
memcached_return_t rc;
- if ((rc= memcached_vdo(server, vector, 4, flush)) != MEMCACHED_SUCCESS)
+ if ((rc= memcached_vdo(server, vector, 5, flush)) != MEMCACHED_SUCCESS)
{
memcached_io_reset(server);
- if (ptr->error_messages == NULL)
+#if 0
+ if (memcached_has_error(ptr))
{
memcached_set_error(*server, rc, MEMCACHED_AT);
}
+#endif
return MEMCACHED_WRITE_FAILURE;
}
- if (verb == SET_OP && ptr->number_of_replicas > 0)
+ if (verb == SET_OP and ptr->number_of_replicas > 0)
{
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SETQ;
WATCHPOINT_STRING("replicating");
memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, server_key);
- if (memcached_vdo(instance, vector, 4, false) != MEMCACHED_SUCCESS)
+ if (memcached_vdo(instance, vector, 5, false) != MEMCACHED_SUCCESS)
{
memcached_io_reset(instance);
}
return MEMCACHED_BUFFERED;
}
- if (noreply)
+ // No reply always assumes success
+ if (reply == false)
{
return MEMCACHED_SUCCESS;
}
const uint32_t flags,
const uint64_t cas,
const bool flush,
+ const bool reply,
const memcached_storage_action_t verb)
{
- // Invert the logic to make it simpler to read the code
- bool reply= (ptr->flags.no_reply) ? false : true;
-
char flags_buffer[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1];
int flags_buffer_length= snprintf(flags_buffer, sizeof(flags_buffer), " %u", flags);
if (size_t(flags_buffer_length) >= sizeof(flags_buffer) or flags_buffer_length < 0)
}
}
- struct libmemcached_io_vector_st vector[]=
+ libmemcached_io_vector_st vector[]=
{
+ { NULL, 0 },
{ storage_op_string(verb), strlen(storage_op_string(verb))},
{ memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) },
{ key, key_length },
{ memcached_literal_param("\r\n") }
};
- if (memcached_is_udp(instance->root))
- {
- size_t write_length= io_vector_total_size(vector, 11);
+ /* Send command header */
+ memcached_return_t rc= memcached_vdo(instance, vector, 12, flush);
- size_t cmd_size= write_length + value_length +2;
- if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
- {
- return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
- }
+ // If we should not reply, return with MEMCACHED_SUCCESS, unless error
+ if (reply == false)
+ {
+ return memcached_success(rc) ? MEMCACHED_SUCCESS : rc;
+ }
- if (cmd_size + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
- {
- memcached_io_write(instance);
- }
+ if (flush == false)
+ {
+ return memcached_success(rc) ? MEMCACHED_BUFFERED : rc;
}
- /* Send command header */
- memcached_return_t rc= memcached_vdo(instance, vector, 11, flush);
if (rc == MEMCACHED_SUCCESS)
{
- if (ptr->flags.no_reply and flush)
- {
- rc= MEMCACHED_SUCCESS;
- }
- else if (flush == false)
- {
- rc= MEMCACHED_BUFFERED;
- }
- else
- {
- char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+ char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+ rc= memcached_response(instance, buffer, sizeof(buffer), NULL);
- if (rc == MEMCACHED_STORED)
- {
- rc= MEMCACHED_SUCCESS;
- }
+ if (rc == MEMCACHED_STORED)
+ {
+ return MEMCACHED_SUCCESS;
}
}
memcached_io_reset(instance);
}
- if (memcached_failed(rc) and ptr->error_messages == NULL)
+ assert(memcached_failed(rc));
+#if 0
+ if (memcached_has_error(ptr) == false)
{
- memcached_set_error(*ptr, rc, MEMCACHED_AT);
+ return memcached_set_error(*ptr, rc, MEMCACHED_AT);
}
+#endif
return rc;
}
memcached_storage_action_t verb)
{
memcached_return_t rc;
- if (memcached_failed(rc= initialize_query(ptr)))
- {
- return rc;
- }
-
- if (memcached_failed(rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol)))
+ if (memcached_failed(rc= initialize_query(ptr, true)))
{
return rc;
}
if (memcached_failed(memcached_key_test(*ptr, (const char **)&key, &key_length, 1)))
{
- return MEMCACHED_BAD_KEY_PROVIDED;
+ return memcached_last_error(ptr);
}
uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
WATCHPOINT_SET(instance->io_wait_count.read= 0);
WATCHPOINT_SET(instance->io_wait_count.write= 0);
- bool flush= (bool) ((instance->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
- if (ptr->flags.binary_protocol)
+
+ bool flush= true;
+ if (memcached_is_buffering(instance->root) and verb == SET_OP)
+ {
+ flush= false;
+ }
+
+ bool reply= memcached_is_replying(ptr);
+
+ hashkit_string_st* destination= NULL;
+
+ if (memcached_is_encrypted(ptr))
+ {
+ if (can_by_encrypted(verb) == false)
+ {
+ return memcached_set_error(*ptr, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT,
+ memcached_literal_param("Operation not allowed while encyrption is enabled"));
+ }
+
+ if ((destination= hashkit_encrypt(&ptr->hashkit, value, value_length)) == NULL)
+ {
+ return rc;
+ }
+ value= hashkit_string_c_str(destination);
+ value_length= hashkit_string_length(destination);
+ }
+
+ if (memcached_is_binary(ptr))
{
rc= memcached_send_binary(ptr, instance, server_key,
key, key_length,
value, value_length, expiration,
- flags, cas, flush, verb);
+ flags, cas, flush, reply, verb);
}
else
{
rc= memcached_send_ascii(ptr, instance,
key, key_length,
value, value_length, expiration,
- flags, cas, flush, verb);
+ flags, cas, flush, reply, verb);
}
+ hashkit_string_free(destination);
+
return rc;
}
rc= memcached_send(ptr, key, key_length,
key, key_length, value, value_length,
expiration, flags, 0, ADD_OP);
+
LIBMEMCACHED_MEMCACHED_ADD_END();
return rc;
}
time_t expiration,
uint32_t flags)
{
- memcached_return_t rc;
- rc= memcached_send(ptr, group_key, group_key_length,
- key, key_length, value, value_length,
- expiration, flags, 0, PREPEND_OP);
- return rc;
+ return memcached_send(ptr, group_key, group_key_length,
+ key, key_length, value, value_length,
+ expiration, flags, 0, PREPEND_OP);
}
memcached_return_t memcached_append_by_key(memcached_st *ptr,
time_t expiration,
uint32_t flags)
{
- memcached_return_t rc;
- rc= memcached_send(ptr, group_key, group_key_length,
- key, key_length, value, value_length,
- expiration, flags, 0, APPEND_OP);
- return rc;
+ return memcached_send(ptr, group_key, group_key_length,
+ key, key_length, value, value_length,
+ expiration, flags, 0, APPEND_OP);
}
memcached_return_t memcached_cas_by_key(memcached_st *ptr,
uint32_t flags,
uint64_t cas)
{
- memcached_return_t rc;
- rc= memcached_send(ptr, group_key, group_key_length,
- key, key_length, value, value_length,
- expiration, flags, cas, CAS_OP);
- return rc;
+ return memcached_send(ptr, group_key, group_key_length,
+ key, key_length, value, value_length,
+ expiration, flags, cas, CAS_OP);
}
projects / m6w6 / libmemcached / blobdiff