projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for 809390
[awesomized/libmemcached]
/
libmemcached
/
get.cc
diff --git
a/libmemcached/get.cc
b/libmemcached/get.cc
index bcc2dd8cd409adf61e4917bc1a3be6a36cb051e1..794d3d152e8d6dd47513246ab62e637bc09335b0 100644
(file)
--- a/
libmemcached/get.cc
+++ b/
libmemcached/get.cc
@@
-36,7
+36,6
@@
*/
#include <libmemcached/common.h>
*/
#include <libmemcached/common.h>
-#include <cassert>
/*
What happens if no servers exist?
/*
What happens if no servers exist?
@@
-87,7
+86,7
@@
char *memcached_get_by_key(memcached_st *ptr,
*error= memcached_mget_by_key_real(ptr, group_key, group_key_length,
(const char * const *)&key, &key_length,
1, false);
*error= memcached_mget_by_key_real(ptr, group_key, group_key_length,
(const char * const *)&key, &key_length,
1, false);
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
if (memcached_failed(*error))
if (memcached_failed(*error))
@@
-105,7
+104,7
@@
char *memcached_get_by_key(memcached_st *ptr,
char *value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
char *value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
/* This is for historical reasons */
if (*error == MEMCACHED_END)
/* This is for historical reasons */
if (*error == MEMCACHED_END)
@@
-157,7
+156,7
@@
char *memcached_get_by_key(memcached_st *ptr,
}
}
}
}
}
}
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
return NULL;
}
return NULL;
}
@@
-171,7
+170,7
@@
char *memcached_get_by_key(memcached_st *ptr,
&dummy_error);
WATCHPOINT_ASSERT(dummy_length == 0);
WATCHPOINT_ASSERT(dummy_value == 0);
&dummy_error);
WATCHPOINT_ASSERT(dummy_length == 0);
WATCHPOINT_ASSERT(dummy_value == 0);
- assert
(ptr->query_id == query_id +1
);
+ assert
_msg(ptr->query_id == query_id +1, "Programmer error, the query_id was not incremented."
);
return value;
}
return value;
}
@@
-300,7
+299,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
struct libmemcached_io_vector_st vector[]=
{
{ get_command_length, get_command },
struct libmemcached_io_vector_st vector[]=
{
{ get_command_length, get_command },
- { memcached_array_size(ptr->
prefix_key), memcached_array_string(ptr->prefix_key
) },
+ { memcached_array_size(ptr->
_namespace), memcached_array_string(ptr->_namespace
) },
{ key_length[x], keys[x] },
{ 1, " " }
};
{ key_length[x], keys[x] },
{ 1, " " }
};
@@
-493,14
+492,14
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
return vk;
}
return vk;
}
- request.message.header.request.keylen= htons((uint16_t)(key_length[x] + memcached_array_size(ptr->
prefix_key
)));
+ request.message.header.request.keylen= htons((uint16_t)(key_length[x] + memcached_array_size(ptr->
_namespace
)));
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + memcached_array_size(ptr->
prefix_key
)));
+ request.message.header.request.bodylen= htonl((uint32_t)( key_length[x] + memcached_array_size(ptr->
_namespace
)));
struct libmemcached_io_vector_st vector[]=
{
{ sizeof(request.bytes), request.bytes },
struct libmemcached_io_vector_st vector[]=
{
{ sizeof(request.bytes), request.bytes },
- { memcached_array_size(ptr->
prefix_key), memcached_array_string(ptr->prefix_key
) },
+ { memcached_array_size(ptr->
_namespace), memcached_array_string(ptr->_namespace
) },
{ key_length[x], keys[x] }
};
{ key_length[x], keys[x] }
};
@@
-612,9
+611,9
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
protocol_binary_request_getk request= {};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
protocol_binary_request_getk request= {};
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK;
- request.message.header.request.keylen= htons((uint16_t)(key_length[x] + memcached_array_size(ptr->
prefix_key
)));
+ request.message.header.request.keylen= htons((uint16_t)(key_length[x] + memcached_array_size(ptr->
_namespace
)));
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl((uint32_t)(key_length[x] + memcached_array_size(ptr->
prefix_key
)));
+ request.message.header.request.bodylen= htonl((uint32_t)(key_length[x] + memcached_array_size(ptr->
_namespace
)));
/*
* We need to disable buffering to actually know that the request was
/*
* We need to disable buffering to actually know that the request was
@@
-629,7
+628,7
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
struct libmemcached_io_vector_st vector[]=
{
{ sizeof(request.bytes), request.bytes },
struct libmemcached_io_vector_st vector[]=
{
{ sizeof(request.bytes), request.bytes },
- { memcached_array_size(ptr->
prefix_key), memcached_array_string(ptr->prefix_key
) },
+ { memcached_array_size(ptr->
_namespace), memcached_array_string(ptr->_namespace
) },
{ key_length[x], keys[x] }
};
{ key_length[x], keys[x] }
};