#include "common.h"
#include "memcached_io.h"
-static memcached_return binary_response(memcached_server_st *ptr,
- char *buffer, size_t buffer_length,
- memcached_result_st *result);
-
-memcached_return memcached_response(memcached_server_st *ptr,
- char *buffer, size_t buffer_length,
- memcached_result_st *result)
+static memcached_return textual_read_one_response(memcached_server_st *ptr,
+ char *buffer, size_t buffer_length,
+ memcached_result_st *result);
+static memcached_return binary_read_one_response(memcached_server_st *ptr,
+ char *buffer, size_t buffer_length,
+ memcached_result_st *result);
+
+memcached_return memcached_read_one_response(memcached_server_st *ptr,
+ char *buffer, size_t buffer_length,
+ memcached_result_st *result)
{
- unsigned int x;
- size_t send_length;
- char *buffer_ptr;
- unsigned int max_messages;
-
+ memcached_server_response_decrement(ptr);
- send_length= 0;
- /* UDP at the moment is odd...*/
- if (ptr->type == MEMCACHED_CONNECTION_UDP)
- {
- char buffer[8];
- ssize_t read_length;
+ memcached_return rc;
+ if (ptr->root->flags & MEM_BINARY_PROTOCOL)
+ rc= binary_read_one_response(ptr, buffer, buffer_length, result);
+ else
+ rc= textual_read_one_response(ptr, buffer, buffer_length, result);
- return MEMCACHED_SUCCESS;
+ unlikely(rc == MEMCACHED_UNKNOWN_READ_FAILURE ||
+ rc == MEMCACHED_PROTOCOL_ERROR ||
+ rc == MEMCACHED_CLIENT_ERROR ||
+ rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE)
+ memcached_io_reset(ptr);
- read_length= memcached_io_read(ptr, buffer, 8);
- }
+ return rc;
+}
+memcached_return memcached_response(memcached_server_st *ptr,
+ char *buffer, size_t buffer_length,
+ memcached_result_st *result)
+{
/* We may have old commands in the buffer not set, first purge */
if (ptr->root->flags & MEM_NO_BLOCK)
(void)memcached_io_write(ptr, NULL, 0, 1);
- if (ptr->root->flags & MEM_BINARY_PROTOCOL)
- return binary_response(ptr, buffer, buffer_length, result);
-
- max_messages= memcached_server_response_count(ptr);
- for (x= 0; x < max_messages; x++)
- {
- size_t total_length= 0;
- buffer_ptr= buffer;
-
-
- while (1)
- {
- ssize_t read_length;
-
- read_length= memcached_io_read(ptr, buffer_ptr, 1);
- WATCHPOINT_ASSERT(*buffer_ptr != '\0');
+ /*
+ * The previous implementation purged all pending requests and just
+ * returned the last one. Purge all pending messages to ensure backwards
+ * compatibility.
+ */
+ if ((ptr->root->flags & MEM_BINARY_PROTOCOL) == 0)
+ while (memcached_server_response_count(ptr) > 1) {
+ memcached_return rc= memcached_read_one_response(ptr, buffer, buffer_length, result);
+
+ unlikely (rc != MEMCACHED_END &&
+ rc != MEMCACHED_STORED &&
+ rc != MEMCACHED_SUCCESS &&
+ rc != MEMCACHED_STAT &&
+ rc != MEMCACHED_DELETED &&
+ rc != MEMCACHED_NOTFOUND &&
+ rc != MEMCACHED_NOTSTORED &&
+ rc != MEMCACHED_DATA_EXISTS)
+ return rc;
+ }
- if (read_length != 1)
- {
- memcached_io_reset(ptr);
- return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
+ return memcached_read_one_response(ptr, buffer, buffer_length, result);
+}
- if (*buffer_ptr == '\n')
- break;
- else
- buffer_ptr++;
+static memcached_return memcached_readline(memcached_server_st *ptr,
+ char *buffer,
+ size_t size)
+{
+ bool line_complete= false;
+ char *buffer_ptr= buffer;
+ int total_nr=0;
- total_length++;
- WATCHPOINT_ASSERT(total_length <= buffer_length);
+ while (!line_complete)
+ {
+ if (memcached_io_read(ptr, buffer_ptr, 1) != 1)
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
- if (total_length >= buffer_length)
- {
- memcached_io_reset(ptr);
- return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
+ WATCHPOINT_ASSERT(*buffer_ptr != '\0');
+ if (*buffer_ptr == '\n')
+ line_complete=true;
+ else
+ {
+ ++buffer_ptr;
+ ++total_nr;
}
- buffer_ptr++;
- *buffer_ptr= 0;
- memcached_server_response_decrement(ptr);
+ if (total_nr == size)
+ return MEMCACHED_PROTOCOL_ERROR;
}
+ return MEMCACHED_SUCCESS;
+}
+
+static memcached_return textual_read_one_response(memcached_server_st *ptr,
+ char *buffer, size_t buffer_length,
+ memcached_result_st *result)
+{
+ memcached_return rc=memcached_readline(ptr, buffer, buffer_length);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
+
switch(buffer[0])
{
case 'V': /* VALUE || VERSION */
{
WATCHPOINT_STRING(buffer);
WATCHPOINT_ASSERT(0);
- memcached_io_reset(ptr);
return MEMCACHED_UNKNOWN_READ_FAILURE;
}
case 'O': /* OK */
{
WATCHPOINT_STRING(buffer);
WATCHPOINT_ASSERT(0);
- memcached_io_reset(ptr);
return MEMCACHED_UNKNOWN_READ_FAILURE;
}
}
else if (buffer[4] == 'S')
return MEMCACHED_NOTSTORED;
else
- {
- memcached_io_reset(ptr);
return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
}
case 'E': /* PROTOCOL ERROR or END */
{
if (buffer[1] == 'N')
return MEMCACHED_END;
else if (buffer[1] == 'R')
- {
- memcached_io_reset(ptr);
return MEMCACHED_PROTOCOL_ERROR;
- }
else if (buffer[1] == 'X')
- {
return MEMCACHED_DATA_EXISTS;
- }
else
- {
- memcached_io_reset(ptr);
return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
}
case 'C': /* CLIENT ERROR */
- memcached_io_reset(ptr);
return MEMCACHED_CLIENT_ERROR;
default:
{
unsigned long long auto_return_value;
- if (sscanf(buffer, "%llu", &auto_return_value) == 1)
+ if (sscanf(buffer, "%llu", &auto_return_value) == 1)
return MEMCACHED_SUCCESS;
- memcached_io_reset(ptr);
-
return MEMCACHED_UNKNOWN_READ_FAILURE;
}
-
}
return MEMCACHED_SUCCESS;
return memcached_string_length(sptr);
}
-/**
- * Read a given number of bytes from the server and place it into a specific
- * buffer. Reset the IO channel or this server if an error occurs.
- */
-static memcached_return safe_read(memcached_server_st *ptr, void *dta,
- size_t size)
-{
- size_t offset= 0;
- char *data= dta;
-
- while (offset < size)
- {
- ssize_t nread= memcached_io_read(ptr, data + offset, size - offset);
- if (nread <= 0)
- {
- memcached_io_reset(ptr);
- return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
- offset += nread;
- }
-
- return MEMCACHED_SUCCESS;
-}
-
-static memcached_return binary_response(memcached_server_st *ptr,
- char *buffer,
- size_t buffer_length,
- memcached_result_st *result)
+static memcached_return binary_read_one_response(memcached_server_st *ptr,
+ char *buffer, size_t buffer_length,
+ memcached_result_st *result)
{
protocol_binary_response_header header;
- memcached_server_response_decrement(ptr);
- unlikely (safe_read(ptr, &header.bytes,
- sizeof(header.bytes)) != MEMCACHED_SUCCESS)
+ unlikely (memcached_safe_read(ptr, &header.bytes,
+ sizeof(header.bytes)) != MEMCACHED_SUCCESS)
return MEMCACHED_UNKNOWN_READ_FAILURE;
unlikely (header.response.magic != PROTOCOL_BINARY_RES)
- {
- memcached_io_reset(ptr);
return MEMCACHED_PROTOCOL_ERROR;
- }
/*
** Convert the header to host local endian!
memcached_result_reset(result);
result->cas= header.response.cas;
- if (safe_read(ptr, &result->flags,
- sizeof(result->flags)) != MEMCACHED_SUCCESS)
- {
+ if (memcached_safe_read(ptr, &result->flags,
+ sizeof (result->flags)) != MEMCACHED_SUCCESS)
return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
+
result->flags= ntohl(result->flags);
bodylen -= header.response.extlen;
result->key_length= keylen;
- if (safe_read(ptr, result->key, keylen) != MEMCACHED_SUCCESS)
- {
+ if (memcached_safe_read(ptr, result->key, keylen) != MEMCACHED_SUCCESS)
return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
bodylen -= keylen;
if (memcached_string_check(&result->value,
bodylen) != MEMCACHED_SUCCESS)
- {
- memcached_io_reset(ptr);
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
- }
char *vptr= memcached_string_value(&result->value);
- if (safe_read(ptr, vptr, bodylen) != MEMCACHED_SUCCESS)
- {
+ if (memcached_safe_read(ptr, vptr, bodylen) != MEMCACHED_SUCCESS)
return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
memcached_string_set_length(&result->value, bodylen);
}
case PROTOCOL_BINARY_CMD_DECREMENT:
{
if (bodylen != sizeof(uint64_t) || buffer_length != sizeof(uint64_t))
- {
return MEMCACHED_PROTOCOL_ERROR;
- }
WATCHPOINT_ASSERT(bodylen == buffer_length);
uint64_t val;
- if (safe_read(ptr, &val, sizeof(val)) != MEMCACHED_SUCCESS)
- {
+ if (memcached_safe_read(ptr, &val, sizeof(val)) != MEMCACHED_SUCCESS)
return MEMCACHED_UNKNOWN_READ_FAILURE;
- }
val= ntohll(val);
memcpy(buffer, &val, sizeof(val));
if (bodylen >= buffer_length)
/* not enough space in buffer.. should not happen... */
return MEMCACHED_UNKNOWN_READ_FAILURE;
- else
- safe_read(ptr, buffer, bodylen);
+ else if (memcached_safe_read(ptr, buffer, bodylen) != MEMCACHED_SUCCESS)
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
}
break;
case PROTOCOL_BINARY_CMD_FLUSH:
{
size_t keylen= header.response.keylen;
memset(buffer, 0, buffer_length);
- safe_read(ptr, buffer, keylen);
- safe_read(ptr, buffer + keylen + 1, bodylen - keylen);
+ if (memcached_safe_read(ptr, buffer, keylen) != MEMCACHED_SUCCESS ||
+ memcached_safe_read(ptr, buffer + keylen + 1,
+ bodylen - keylen) != MEMCACHED_SUCCESS)
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
}
}
break;
{
/* Command not implemented yet! */
WATCHPOINT_ASSERT(0);
- memcached_io_reset(ptr);
return MEMCACHED_PROTOCOL_ERROR;
}
}
while (bodylen > 0)
{
size_t nr= (bodylen > SMALL_STRING_LEN) ? SMALL_STRING_LEN : bodylen;
- safe_read(ptr, buffer, nr);
+ if (memcached_safe_read(ptr, buffer, nr) != MEMCACHED_SUCCESS)
+ return MEMCACHED_UNKNOWN_READ_FAILURE;
bodylen -= nr;
}
}
projects / awesomized / libmemcached / blobdiff