projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed a little autoconf quoting. Updated AC_OUTPUT.
[awesomized/libmemcached]
/
libmemcached
/
memcached_get.c
diff --git
a/libmemcached/memcached_get.c
b/libmemcached/memcached_get.c
index dcaa8988a257344a543c34cf39e0fe6963c714c5..9a33fc6910b3825ffc3cc12c87ff1702d6e8a5fa 100644
(file)
--- a/
libmemcached/memcached_get.c
+++ b/
libmemcached/memcached_get.c
@@
-27,6
+27,12
@@
char *memcached_get_by_key(memcached_st *ptr,
uint32_t dummy_flags;
memcached_return dummy_error;
uint32_t dummy_flags;
memcached_return dummy_error;
+ if (ptr->flags & MEM_USE_UDP)
+ {
+ *error= MEMCACHED_NOT_SUPPORTED;
+ return NULL;
+ }
+
/* Request the key */
*error= memcached_mget_by_key(ptr,
master_key,
/* Request the key */
*error= memcached_mget_by_key(ptr,
master_key,
@@
-104,6
+110,7
@@
memcached_return memcached_mget(memcached_st *ptr,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
+ bool is_master_key_set,
char **keys, size_t *key_length,
unsigned int number_of_keys);
char **keys, size_t *key_length,
unsigned int number_of_keys);
@@
-118,7
+125,11
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
memcached_return rc= MEMCACHED_NOTFOUND;
char *get_command= "get ";
uint8_t get_command_length= 4;
memcached_return rc= MEMCACHED_NOTFOUND;
char *get_command= "get ";
uint8_t get_command_length= 4;
- unsigned int master_server_key= 0;
+ unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
+ bool is_master_key_set= false;
+
+ if (ptr->flags & MEM_USE_UDP)
+ return MEMCACHED_NOT_SUPPORTED;
LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
@@
-129,7
+140,7
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
if (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
if (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcach
e
d_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags & MEM_SUPPORT_CAS)
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags & MEM_SUPPORT_CAS)
@@
-140,9
+151,10
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
if (master_key && master_key_length)
{
if (master_key && master_key_length)
{
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcach
e
d_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
return MEMCACHED_BAD_KEY_PROVIDED;
master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ is_master_key_set= true;
}
/*
}
/*
@@
-166,7
+178,7
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
}
if (ptr->flags & MEM_BINARY_PROTOCOL)
}
if (ptr->flags & MEM_BINARY_PROTOCOL)
- return binary_mget_by_key(ptr, master_server_key, keys,
+ return binary_mget_by_key(ptr, master_server_key,
is_master_key_set,
keys,
key_length, number_of_keys);
/*
key_length, number_of_keys);
/*
@@
-177,7
+189,7
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
{
unsigned int server_key;
{
unsigned int server_key;
- if (
master_server_key
)
+ if (
is_master_key_set
)
server_key= master_server_key;
else
server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
server_key= master_server_key;
else
server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
@@
-246,10
+258,12
@@
memcached_return memcached_mget_by_key(memcached_st *ptr,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
static memcached_return binary_mget_by_key(memcached_st *ptr,
unsigned int master_server_key,
+ bool is_master_key_set,
char **keys, size_t *key_length,
unsigned int number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
char **keys, size_t *key_length,
unsigned int number_of_keys)
{
memcached_return rc= MEMCACHED_NOTFOUND;
+ uint32_t x;
int flush= number_of_keys == 1;
int flush= number_of_keys == 1;
@@
-257,11
+271,11
@@
static memcached_return binary_mget_by_key(memcached_st *ptr,
If a server fails we warn about errors and start all over with sending keys
to the server.
*/
If a server fails we warn about errors and start all over with sending keys
to the server.
*/
- for (
int
x= 0; x < number_of_keys; x++)
+ for (x= 0; x < number_of_keys; x++)
{
unsigned int server_key;
{
unsigned int server_key;
- if (
master_server_key
)
+ if (
is_master_key_set
)
server_key= master_server_key;
else
server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
server_key= master_server_key;
else
server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
@@
-273,13
+287,23
@@
static memcached_return binary_mget_by_key(memcached_st *ptr,
continue;
}
continue;
}
- protocol_binary_request_getk request= {
0
};
+ protocol_binary_request_getk request= {
.bytes= {0}
};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
if (number_of_keys == 1)
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
else
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
if (number_of_keys == 1)
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
else
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ;
+ memcached_return vk;
+ vk= memcached_validate_key_length(key_length[x],
+ ptr->flags & MEM_BINARY_PROTOCOL);
+ unlikely (vk != MEMCACHED_SUCCESS)
+ {
+ if (x > 0)
+ memcached_io_reset(&ptr->hosts[server_key]);
+ return vk;
+ }
+
request.message.header.request.keylen= htons((uint16_t)key_length[x]);
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.bodylen= htonl(key_length[x]);
request.message.header.request.keylen= htons((uint16_t)key_length[x]);
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.bodylen= htonl(key_length[x]);
@@
-294,6
+318,9
@@
static memcached_return binary_mget_by_key(memcached_st *ptr,
continue;
}
memcached_server_response_increment(&ptr->hosts[server_key]);
continue;
}
memcached_server_response_increment(&ptr->hosts[server_key]);
+ if ((x > 0 && x == ptr->io_key_prefetch) &&
+ memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS)
+ rc= MEMCACHED_SOME_ERRORS;
}
if (number_of_keys > 1)
}
if (number_of_keys > 1)
@@
-301,12
+328,12
@@
static memcached_return binary_mget_by_key(memcached_st *ptr,
/*
* Send a noop command to flush the buffers
*/
/*
* Send a noop command to flush the buffers
*/
- protocol_binary_request_noop request= {
0
};
+ protocol_binary_request_noop request= {
.bytes= {0}
};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_NOOP;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_NOOP;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- for (
int
x= 0; x < ptr->number_of_hosts; x++)
+ for (x= 0; x < ptr->number_of_hosts; x++)
if (memcached_server_response_count(&ptr->hosts[x]))
{
if (memcached_io_write(&ptr->hosts[x], NULL, 0, 1) == -1)
if (memcached_server_response_count(&ptr->hosts[x]))
{
if (memcached_io_write(&ptr->hosts[x], NULL, 0, 1) == -1)