X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=d8b124325aafb4c08270f0cadae4f423aa85e8bc;hb=ac7b4013b6ada79981f5385c10c2ba242df58143;hp=8d2ed8c5d4adb0b3b312964f6f47830b3588a3f3;hpb=93cab40b9112f97376381038e83240a7b28c24ea;p=awesomized%2Flibmemcached diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c index 8d2ed8c5..d8b12432 100644 --- a/lib/memcached_storage.c +++ b/lib/memcached_storage.c @@ -20,7 +20,7 @@ typedef enum { } memcached_storage_action; /* Inline this */ -char *storage_op_string(memcached_storage_action verb) +static char *storage_op_string(memcached_storage_action verb) { switch (verb) { @@ -42,10 +42,11 @@ char *storage_op_string(memcached_storage_action verb) } static inline memcached_return memcached_send(memcached_st *ptr, + char *master_key, size_t master_key_length, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags, + uint32_t flags, uint64_t cas, memcached_storage_action verb) { @@ -56,39 +57,28 @@ static inline memcached_return memcached_send(memcached_st *ptr, char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE]; unsigned int server_key; - WATCHPOINT_ASSERT(value); - WATCHPOINT_ASSERT(value_length); + WATCHPOINT_ASSERT(!(value == NULL && value_length > 0)); + WATCHPOINT_ASSERT(!(value && value_length == 0)); if (key_length == 0) return MEMCACHED_NO_KEY_PROVIDED; - /* Leaving this WATCHPOINT_ASSERT in since only a library fubar could blow this */ -#ifdef NOT_DONE - if (!(ptr->flags & MEM_NO_BLOCK) && ptr->write_buffer_offset != 0) - WATCHPOINT_ASSERT(0); -#endif - - if (ptr->hosts == NULL || ptr->number_of_hosts == 0) + if (ptr->number_of_hosts == 0) return MEMCACHED_NO_SERVERS; - - server_key= memcached_generate_hash(ptr, key, key_length); - - rc= memcached_connect(ptr, server_key); - if (rc != MEMCACHED_SUCCESS) - return rc; + server_key= memcached_generate_hash(ptr, master_key, master_key_length); if (cas) - write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, - "%s %.*s %u %llu %zu\r\n", storage_op_string(verb), - (int)key_length, key, flags, - (unsigned long long)expiration, value_length); - else write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "%s %.*s %u %llu %zu %llu\r\n", storage_op_string(verb), (int)key_length, key, flags, (unsigned long long)expiration, value_length, (unsigned long long)cas); + else + write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, + "%s %.*s %u %llu %zu\r\n", storage_op_string(verb), + (int)key_length, key, flags, + (unsigned long long)expiration, value_length); if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE) { @@ -96,50 +86,39 @@ static inline memcached_return memcached_send(memcached_st *ptr, goto error; } - /* - We have to flush after sending the command. Memcached is not smart enough - to just keep reading from the socket :( - */ - if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length, 0)) == -1) - { - rc= MEMCACHED_WRITE_FAILURE; + rc= memcached_do(&ptr->hosts[server_key], buffer, write_length, 0); + if (rc != MEMCACHED_SUCCESS) goto error; - } - if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1) + if ((sent_length= memcached_io_write(&ptr->hosts[server_key], value, value_length, 0)) == -1) { rc= MEMCACHED_WRITE_FAILURE; goto error; } - if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP) + if ((ptr->flags & MEM_BUFFER_REQUESTS) && verb == SET_OP) to_write= 0; else to_write= 1; - if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1) + if ((sent_length= memcached_io_write(&ptr->hosts[server_key], "\r\n", 2, to_write)) == -1) { - memcached_quit_server(ptr, server_key); rc= MEMCACHED_WRITE_FAILURE; goto error; } - if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP) - { - rc= MEMCACHED_SUCCESS; - memcached_server_response_increment(ptr, server_key); - } - else - { - rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key); - } + if (to_write == 0) + return MEMCACHED_BUFFERED; + + rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL); + if (rc == MEMCACHED_STORED) return MEMCACHED_SUCCESS; else return rc; error: - memcached_io_reset(ptr, server_key); + memcached_io_reset(&ptr->hosts[server_key]); return rc; } @@ -147,12 +126,13 @@ error: memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint32_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_SET_START(); - rc= memcached_send(ptr, key, key_length, value, value_length, - expiration, flags, 0, SET_OP); + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, SET_OP); LIBMEMCACHED_MEMCACHED_SET_END(); return rc; } @@ -161,12 +141,13 @@ memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint32_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_ADD_START(); - rc= memcached_send(ptr, key, key_length, value, value_length, - expiration, flags, 0, ADD_OP); + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, ADD_OP); LIBMEMCACHED_MEMCACHED_ADD_END(); return rc; } @@ -175,12 +156,13 @@ memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint32_t flags) { memcached_return rc; LIBMEMCACHED_MEMCACHED_REPLACE_START(); - rc= memcached_send(ptr, key, key_length, value, value_length, - expiration, flags, 0, REPLACE_OP); + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, REPLACE_OP); LIBMEMCACHED_MEMCACHED_REPLACE_END(); return rc; } @@ -189,10 +171,11 @@ memcached_return memcached_prepend(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint32_t flags) { memcached_return rc; - rc= memcached_send(ptr, key, key_length, value, value_length, + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, expiration, flags, 0, PREPEND_OP); return rc; } @@ -201,10 +184,11 @@ memcached_return memcached_append(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags) + uint32_t flags) { memcached_return rc; - rc= memcached_send(ptr, key, key_length, value, value_length, + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, expiration, flags, 0, APPEND_OP); return rc; } @@ -213,11 +197,103 @@ memcached_return memcached_cas(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags, + uint32_t flags, uint64_t cas) { memcached_return rc; - rc= memcached_send(ptr, key, key_length, value, value_length, + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, cas, APPEND_OP); + return rc; +} + +memcached_return memcached_set_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint32_t flags) +{ + memcached_return rc; + LIBMEMCACHED_MEMCACHED_SET_START(); + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, SET_OP); + LIBMEMCACHED_MEMCACHED_SET_END(); + return rc; +} + +memcached_return memcached_add_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint32_t flags) +{ + memcached_return rc; + LIBMEMCACHED_MEMCACHED_ADD_START(); + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, ADD_OP); + LIBMEMCACHED_MEMCACHED_ADD_END(); + return rc; +} + +memcached_return memcached_replace_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint32_t flags) +{ + memcached_return rc; + LIBMEMCACHED_MEMCACHED_REPLACE_START(); + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, REPLACE_OP); + LIBMEMCACHED_MEMCACHED_REPLACE_END(); + return rc; +} + +memcached_return memcached_prepend_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint32_t flags) +{ + memcached_return rc; + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, PREPEND_OP); + return rc; +} + +memcached_return memcached_append_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint32_t flags) +{ + memcached_return rc; + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, + expiration, flags, 0, APPEND_OP); + return rc; +} + +memcached_return memcached_cas_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + char *value, size_t value_length, + time_t expiration, + uint32_t flags, + uint64_t cas) +{ + memcached_return rc; + rc= memcached_send(ptr, key, key_length, + key, key_length, value, value_length, expiration, flags, cas, APPEND_OP); return rc; }