projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Extend test.
[m6w6/libmemcached]
/
libmemcached
/
storage.c
diff --git
a/libmemcached/storage.c
b/libmemcached/storage.c
index 782a3766790177b76867da59157d5e065e59a355..c31a473a3b50291cc56798c50b2900b129f2fec7 100644
(file)
--- a/
libmemcached/storage.c
+++ b/
libmemcached/storage.c
@@
-106,12
+106,11
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
{
int check_length;
check_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
{
int check_length;
check_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
- "%s %.*s%.*s %u %llu %
z
u %llu%s\r\n",
+ "%s %.*s%.*s %u %llu %
l
u %llu%s\r\n",
storage_op_string(verb),
storage_op_string(verb),
- (int)ptr->prefix_key_length,
- ptr->prefix_key,
+ memcached_print_array(ptr->prefix_key),
(int)key_length, key, flags,
(int)key_length, key, flags,
- (unsigned long long)expiration, value_length,
+ (unsigned long long)expiration,
(unsigned long)
value_length,
(unsigned long long)cas,
(ptr->flags.no_reply) ? " noreply" : "");
if (check_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || check_length < 0)
(unsigned long long)cas,
(ptr->flags.no_reply) ? " noreply" : "");
if (check_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || check_length < 0)
@@
-132,10
+131,10
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
memcpy(buffer_ptr, command, strlen(command));
/* Copy in the key prefix, switch to the buffer_ptr */
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, ptr->prefix_key_length
);
+ buffer_ptr= memcpy((buffer_ptr + strlen(command)),
memcached_array_string(ptr->prefix_key), memcached_array_size(ptr->prefix_key)
);
/* Copy in the key, adjust point if a key prefix was used. */
/* Copy in the key, adjust point if a key prefix was used. */
- buffer_ptr= memcpy(buffer_ptr +
(ptr->prefix_key_length ? ptr->prefix_key_length : 0
),
+ buffer_ptr= memcpy(buffer_ptr +
memcached_array_size(ptr->prefix_key
),
key, key_length);
buffer_ptr+= key_length;
buffer_ptr[0]= ' ';
key, key_length);
buffer_ptr+= key_length;
buffer_ptr[0]= ' ';
@@
-144,9
+143,9
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
write_length= (size_t)(buffer_ptr - buffer);
int check_length;
check_length= snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE -(size_t)(buffer_ptr - buffer),
write_length= (size_t)(buffer_ptr - buffer);
int check_length;
check_length= snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE -(size_t)(buffer_ptr - buffer),
- "%u %llu %
z
u%s\r\n",
+ "%u %llu %
l
u%s\r\n",
flags,
flags,
- (unsigned long long)expiration, value_length,
+ (unsigned long long)expiration,
(unsigned long)
value_length,
ptr->flags.no_reply ? " noreply" : "");
if ((size_t)check_length >= MEMCACHED_DEFAULT_COMMAND_SIZE -(size_t)(buffer_ptr - buffer) || check_length < 0)
{
ptr->flags.no_reply ? " noreply" : "");
if ((size_t)check_length >= MEMCACHED_DEFAULT_COMMAND_SIZE -(size_t)(buffer_ptr - buffer) || check_length < 0)
{
@@
-310,8
+309,8
@@
memcached_return_t memcached_cas(memcached_st *ptr,
}
memcached_return_t memcached_set_by_key(memcached_st *ptr,
}
memcached_return_t memcached_set_by_key(memcached_st *ptr,
- const char *master_key
__attribute__((unused))
,
- size_t master_key_length
__attribute__((unused))
,
+ const char *master_key,
+ size_t master_key_length,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
const char *key, size_t key_length,
const char *value, size_t value_length,
time_t expiration,
@@
-479,7
+478,7
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= get_com_code(verb, noreply);
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= get_com_code(verb, noreply);
- request.message.header.request.keylen= htons((uint16_t)(key_length +
ptr->prefix_key_length
));
+ request.message.header.request.keylen= htons((uint16_t)(key_length +
memcached_array_size(ptr->prefix_key)
));
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! */
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! */
@@
-490,7
+489,7
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
request.message.body.expiration= htonl((uint32_t)expiration);
}
request.message.body.expiration= htonl((uint32_t)expiration);
}
- request.message.header.request.bodylen= htonl((uint32_t) (key_length +
ptr->prefix_key_length
+ value_length +
+ request.message.header.request.bodylen= htonl((uint32_t) (key_length +
memcached_array_size(ptr->prefix_key)
+ value_length +
request.message.header.request.extlen));
if (cas)
request.message.header.request.extlen));
if (cas)
@@
-515,7
+514,7
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
struct libmemcached_io_vector_st vector[]=
{
{ .length= send_length, .buffer= request.bytes },
struct libmemcached_io_vector_st vector[]=
{
{ .length= send_length, .buffer= request.bytes },
- { .length=
ptr->prefix_key_length, .buffer= ptr->prefix_key
},
+ { .length=
memcached_array_size(ptr->prefix_key), .buffer= memcached_array_string(ptr->prefix_key)
},
{ .length= key_length, .buffer= key },
{ .length= value_length, .buffer= value }
};
{ .length= key_length, .buffer= key },
{ .length= value_length, .buffer= value }
};