return "tosserror"; /* This is impossible, fixes issue for compiler warning in VisualStudio */
};
- return SET_OP;
+ /* NOTREACHED */
}
static memcached_return memcached_send_binary(memcached_server_st* server,
WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
- unlikely (key_length == 0)
- return MEMCACHED_NO_KEY_PROVIDED;
-
+ rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
+ unlikely (rc != MEMCACHED_SUCCESS)
+ return rc;
+
unlikely (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&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)
write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "%s %s%.*s %u %llu %zu %llu\r\n", storage_op_string(verb),
+ "%s %s%.*s %u %llu %zu %llu%s\r\n",
+ storage_op_string(verb),
ptr->prefix_key,
(int)key_length, key, flags,
(unsigned long long)expiration, value_length,
- (unsigned long long)cas);
+ (unsigned long long)cas,
+ (ptr->flags & MEM_NOREPLY) ? " noreply" : "");
else
write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "%s %s%.*s %u %llu %zu\r\n", storage_op_string(verb),
+ "%s %s%.*s %u %llu %zu%s\r\n",
+ storage_op_string(verb),
ptr->prefix_key,
(int)key_length, key, flags,
- (unsigned long long)expiration, value_length);
+ (unsigned long long)expiration, value_length,
+ (ptr->flags & MEM_NOREPLY) ? " noreply" : "");
+
+ if (ptr->flags & MEM_USE_UDP && ptr->flags & MEM_BUFFER_REQUESTS)
+ {
+ size_t cmd_size= write_length + value_length + 2;
+ if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
+ return MEMCACHED_WRITE_FAILURE;
+ if (cmd_size + ptr->hosts[server_key].write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
+ memcached_io_write(&ptr->hosts[server_key], NULL, 0, 1);
+ }
if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
{
goto error;
}
+ /* Send command header */
rc= memcached_do(&ptr->hosts[server_key], buffer, write_length, 0);
if (rc != MEMCACHED_SUCCESS)
goto error;
+ /* Send command body */
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_NOREPLY)
+ return (to_write == 0) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+
if (to_write == 0)
return MEMCACHED_BUFFERED;
}
memcached_return memcached_set_by_key(memcached_st *ptr,
- const char *master_key, size_t master_key_length,
+ const char *master_key __attribute__((unused)),
+ size_t master_key_length __attribute__((unused)),
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_SET_START();
- rc= memcached_send(ptr, key, key_length,
+ rc= memcached_send(ptr, master_key, master_key_length,
key, key_length, value, value_length,
expiration, flags, 0, SET_OP);
LIBMEMCACHED_MEMCACHED_SET_END();
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_ADD_START();
- rc= memcached_send(ptr, key, key_length,
+ rc= memcached_send(ptr, master_key, master_key_length,
key, key_length, value, value_length,
expiration, flags, 0, ADD_OP);
LIBMEMCACHED_MEMCACHED_ADD_END();
{
memcached_return rc;
LIBMEMCACHED_MEMCACHED_REPLACE_START();
- rc= memcached_send(ptr, key, key_length,
+ rc= memcached_send(ptr, master_key, master_key_length,
key, key_length, value, value_length,
expiration, flags, 0, REPLACE_OP);
LIBMEMCACHED_MEMCACHED_REPLACE_END();
uint32_t flags)
{
memcached_return rc;
- rc= memcached_send(ptr, key, key_length,
+ rc= memcached_send(ptr, master_key, master_key_length,
key, key_length, value, value_length,
expiration, flags, 0, PREPEND_OP);
return rc;
uint32_t flags)
{
memcached_return rc;
- rc= memcached_send(ptr, key, key_length,
+ rc= memcached_send(ptr, master_key, master_key_length,
key, key_length, value, value_length,
expiration, flags, 0, APPEND_OP);
return rc;
return rc;
}
+static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply)
+{
+ /* 0 isn't a value we want, but GCC 4.2 seems to think ret can otherwise
+ * be used uninitialized in this function. FAIL */
+ uint8_t ret= 0;
+
+ if (noreply)
+ switch (verb)
+ {
+ case SET_OP:
+ ret=PROTOCOL_BINARY_CMD_SETQ;
+ break;
+ case ADD_OP:
+ ret=PROTOCOL_BINARY_CMD_ADDQ;
+ break;
+ case CAS_OP: /* FALLTHROUGH */
+ case REPLACE_OP:
+ ret=PROTOCOL_BINARY_CMD_REPLACEQ;
+ break;
+ case APPEND_OP:
+ ret=PROTOCOL_BINARY_CMD_APPENDQ;
+ break;
+ case PREPEND_OP:
+ ret=PROTOCOL_BINARY_CMD_PREPENDQ;
+ break;
+ }
+ else
+ switch (verb)
+ {
+ case SET_OP:
+ ret=PROTOCOL_BINARY_CMD_SET;
+ break;
+ case ADD_OP:
+ ret=PROTOCOL_BINARY_CMD_ADD;
+ break;
+ case CAS_OP: /* FALLTHROUGH */
+ case REPLACE_OP:
+ ret=PROTOCOL_BINARY_CMD_REPLACE;
+ break;
+ case APPEND_OP:
+ ret=PROTOCOL_BINARY_CMD_APPEND;
+ break;
+ case PREPEND_OP:
+ ret=PROTOCOL_BINARY_CMD_PREPEND;
+ break;
+ }
+
+ return ret;
+}
+
+
+
static memcached_return memcached_send_binary(memcached_server_st* server,
const char *key,
size_t key_length,
uint64_t cas,
memcached_storage_action verb)
{
+ char flush;
protocol_binary_request_set request= {.bytes= {0}};
size_t send_length= sizeof(request.bytes);
+ bool noreply= server->root->flags & MEM_NOREPLY;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
- switch (verb)
- {
- case SET_OP:
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SET;
- break;
- case ADD_OP:
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_ADD;
- break;
- case REPLACE_OP:
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_REPLACE;
- break;
- case APPEND_OP:
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_APPEND;
- break;
- case PREPEND_OP:
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_PREPEND;
- break;
- case CAS_OP:
- request.message.header.request.opcode= PROTOCOL_BINARY_CMD_REPLACE;
- break;
- default:
- abort();
- }
-
+ request.message.header.request.opcode= get_com_code(verb, noreply);
request.message.header.request.keylen= htons((uint16_t)key_length);
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! */
- else {
+ else
+ {
request.message.header.request.extlen= 8;
request.message.body.flags= htonl(flags);
request.message.body.expiration= htonl((uint32_t)expiration);
if (cas)
request.message.header.request.cas= htonll(cas);
- char flush= ((server->root->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP) ? 0 : 1;
+ flush= ((server->root->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP) ? 0 : 1;
+
+ if ((server->root->flags & MEM_USE_UDP) && !flush)
+ {
+ 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,NULL,0, 1);
+ }
+
/* write the header */
if ((memcached_do(server, (const char*)request.bytes, send_length, 0) != MEMCACHED_SUCCESS) ||
(memcached_io_write(server, key, key_length, 0) == -1) ||
memcached_io_reset(server);
return MEMCACHED_WRITE_FAILURE;
}
-
+
if (flush == 0)
return MEMCACHED_BUFFERED;
-
+
+ if (noreply)
+ return MEMCACHED_SUCCESS;
+
return memcached_response(server, NULL, 0, NULL);
}
projects / awesomized / libmemcached / blobdiff