uint64_t cas,
memcached_storage_action_t verb)
{
- char to_write;
+ bool to_write;
size_t write_length;
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
- unsigned int server_key;
+ uint32_t server_key;
+ memcached_server_instance_st *instance;
WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
}
server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ instance= memcached_server_instance_fetch(ptr, server_key);
if (cas)
{
write_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "%s %s%.*s %u %llu %zu %llu%s\r\n",
+ "%s %.*s%.*s %u %llu %zu %llu%s\r\n",
storage_op_string(verb),
+ (int)ptr->prefix_key_length,
ptr->prefix_key,
(int)key_length, key, flags,
(unsigned long long)expiration, value_length,
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, strlen(ptr->prefix_key));
+ buffer_ptr= memcpy((buffer_ptr + strlen(command)), ptr->prefix_key, ptr->prefix_key_length);
/* Copy in the key, adjust point if a key prefix was used. */
- buffer_ptr= memcpy(buffer_ptr + (ptr->prefix_key ? strlen(ptr->prefix_key) : 0),
+ buffer_ptr= memcpy(buffer_ptr + (ptr->prefix_key_length ? ptr->prefix_key_length : 0),
key, key_length);
buffer_ptr+= key_length;
buffer_ptr[0]= ' ';
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 (cmd_size + instance->write_buffer_offset > MAX_UDP_DATAGRAM_LENGTH)
+ memcached_io_write(instance, NULL, 0, true);
}
if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
}
/* Send command header */
- rc= memcached_do(&ptr->hosts[server_key], buffer, write_length, 0);
+ rc= memcached_do(instance, buffer, write_length, false);
if (rc != MEMCACHED_SUCCESS)
goto error;
/* Send command body */
- if (memcached_io_write(&ptr->hosts[server_key], value, value_length, 0) == -1)
+ if (memcached_io_write(instance, value, value_length, false) == -1)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
if (ptr->flags.buffer_requests && verb == SET_OP)
{
- to_write= 0;
+ to_write= false;
}
else
{
- to_write= 1;
+ to_write= true;
}
- if (memcached_io_write(&ptr->hosts[server_key], "\r\n", 2, to_write) == -1)
+ if (memcached_io_write(instance, "\r\n", 2, to_write) == -1)
{
rc= MEMCACHED_WRITE_FAILURE;
goto error;
}
if (ptr->flags.no_reply)
- return (to_write == 0) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+ return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
- if (to_write == 0)
+ if (to_write == false)
return MEMCACHED_BUFFERED;
- rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+ rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
if (rc == MEMCACHED_STORED)
return MEMCACHED_SUCCESS;
return rc;
error:
- memcached_io_reset(&ptr->hosts[server_key]);
+ memcached_io_reset(instance);
return rc;
}
uint64_t cas,
memcached_storage_action_t verb)
{
- uint8_t flush;
+ bool flush;
protocol_binary_request_set request= {.bytes= {0}};
size_t send_length= sizeof(request.bytes);
uint32_t server_key= memcached_generate_hash(ptr, master_key,
master_key_length);
- memcached_server_st *server= &ptr->hosts[server_key];
+
+ memcached_server_instance_st *server=
+ memcached_server_instance_fetch(ptr, server_key);
+
bool noreply= server->root->flags.no_reply;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
if (cas)
request.message.header.request.cas= htonll(cas);
- flush= (uint8_t) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
+ flush= (bool) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
- if (server->root->flags.use_udp && !flush)
+ if (server->root->flags.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);
+ {
+ memcached_io_write(server, NULL, 0, true);
+ }
}
/* 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_write(server, value, value_length, (char) flush) == -1))
+ if ((memcached_do(server, (const char*)request.bytes, send_length, false) != MEMCACHED_SUCCESS) ||
+ (memcached_io_write(server, key, key_length, false) == -1) ||
+ (memcached_io_write(server, value, value_length, flush) == -1))
{
memcached_io_reset(server);
return MEMCACHED_WRITE_FAILURE;
for (uint32_t x= 0; x < ptr->number_of_replicas; x++)
{
+ memcached_server_instance_st *instance;
+
++server_key;
if (server_key == memcached_server_count(ptr))
server_key= 0;
- memcached_server_st *srv= &ptr->hosts[server_key];
- if ((memcached_do(srv, (const char*)request.bytes,
- send_length, 0) != MEMCACHED_SUCCESS) ||
- (memcached_io_write(srv, key, key_length, 0) == -1) ||
- (memcached_io_write(srv, value, value_length, (char) flush) == -1))
- memcached_io_reset(srv);
+ instance= memcached_server_instance_fetch(ptr, server_key);
+
+ if ((memcached_do(instance, (const char*)request.bytes,
+ send_length, false) != MEMCACHED_SUCCESS) ||
+ (memcached_io_write(instance, key, key_length, false) == -1) ||
+ (memcached_io_write(instance, value, value_length, flush) == -1))
+ {
+ memcached_io_reset(instance);
+ }
else
- memcached_server_response_decrement(srv);
+ {
+ memcached_server_response_decrement(instance);
+ }
}
}
- if (flush == 0)
+ if (flush == false)
+ {
return MEMCACHED_BUFFERED;
+ }
if (noreply)
+ {
return MEMCACHED_SUCCESS;
+ }
return memcached_response(server, NULL, 0, NULL);
}
projects / awesomized / libmemcached / blobdiff