X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.cc;h=06e7ab6419646abb82121ce5d9a775fb5aaeaa07;hb=ae6ce3499b07751cb8b72c960a2a0edfcd4c83a1;hp=4196b6683deb4fc8a8affa6db2bd29ca584a4103;hpb=facfe08e21d2c3135c508ff098ff603ddaacef3e;p=awesomized%2Flibmemcached diff --git a/libmemcached/auto.cc b/libmemcached/auto.cc index 4196b668..06e7ab64 100644 --- a/libmemcached/auto.cc +++ b/libmemcached/auto.cc @@ -37,7 +37,7 @@ #include -static void auto_response(org::libmemcached::Instance* instance, const bool reply, memcached_return_t& rc, uint64_t* value) +static void auto_response(memcached_instance_st* instance, const bool reply, memcached_return_t& rc, uint64_t* value) { // If the message was successfully sent, then get the response, otherwise // fail. @@ -52,17 +52,23 @@ static void auto_response(org::libmemcached::Instance* instance, const bool repl rc= memcached_response(instance, &instance->root->result); } - if (memcached_success(rc)) + if (memcached_fatal(rc)) { - *value= instance->root->result.numeric_value; + assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS); + *value= UINT64_MAX; } - else + else if (memcached_failed(rc)) { *value= UINT64_MAX; } + else + { + assert(memcached_last_error(instance->root) != MEMCACHED_NOTFOUND); + *value= instance->root->result.numeric_value; + } } -static memcached_return_t text_incr_decr(org::libmemcached::Instance* instance, +static memcached_return_t text_incr_decr(memcached_instance_st* instance, const bool is_incr, const char *key, size_t key_length, const uint64_t offset, @@ -96,7 +102,7 @@ static memcached_return_t text_incr_decr(org::libmemcached::Instance* instance, return memcached_vdo(instance, vector, 7, true); } -static memcached_return_t binary_incr_decr(org::libmemcached::Instance* instance, +static memcached_return_t binary_incr_decr(memcached_instance_st* instance, protocol_binary_command cmd, const char *key, const size_t key_length, const uint64_t offset, @@ -149,7 +155,7 @@ memcached_return_t memcached_increment(memcached_st *memc, } static memcached_return_t increment_decrement_by_key(const protocol_binary_command command, - memcached_st *memc, + Memcached *memc, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, @@ -179,7 +185,7 @@ static memcached_return_t increment_decrement_by_key(const protocol_binary_comma } uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length); - org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key); + memcached_instance_st* instance= memcached_instance_fetch(memc, server_key); bool reply= memcached_is_replying(instance->root); @@ -204,7 +210,7 @@ static memcached_return_t increment_decrement_by_key(const protocol_binary_comma } static memcached_return_t increment_decrement_with_initial_by_key(const protocol_binary_command command, - memcached_st *memc, + Memcached *memc, const char *group_key, size_t group_key_length, const char *key, @@ -229,7 +235,7 @@ static memcached_return_t increment_decrement_with_initial_by_key(const protocol if (memcached_is_encrypted(memc)) { return memcached_set_error(*memc, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT, - memcached_literal_param("Operation not allowed while encyrption is enabled")); + memcached_literal_param("Operation not allowed while encryption is enabled")); } if (memcached_failed(rc= memcached_key_test(*memc, (const char **)&key, &key_length, 1))) @@ -238,7 +244,7 @@ static memcached_return_t increment_decrement_with_initial_by_key(const protocol } uint32_t server_key= memcached_generate_hash_with_redistribution(memc, group_key, group_key_length); - org::libmemcached::Instance* instance= memcached_instance_fetch(memc, server_key); + memcached_instance_st* instance= memcached_instance_fetch(memc, server_key); bool reply= memcached_is_replying(instance->root); @@ -270,12 +276,13 @@ memcached_return_t memcached_decrement(memcached_st *memc, } -memcached_return_t memcached_increment_by_key(memcached_st *memc, +memcached_return_t memcached_increment_by_key(memcached_st *shell, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) { + Memcached* memc= memcached2Memcached(shell); LIBMEMCACHED_MEMCACHED_INCREMENT_START(); memcached_return_t rc= increment_decrement_by_key(PROTOCOL_BINARY_CMD_INCREMENT, memc, @@ -288,12 +295,13 @@ memcached_return_t memcached_increment_by_key(memcached_st *memc, return rc; } -memcached_return_t memcached_decrement_by_key(memcached_st *memc, +memcached_return_t memcached_decrement_by_key(memcached_st *shell, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) { + Memcached* memc= memcached2Memcached(shell); LIBMEMCACHED_MEMCACHED_DECREMENT_START(); memcached_return_t rc= increment_decrement_by_key(PROTOCOL_BINARY_CMD_DECREMENT, memc, @@ -318,7 +326,7 @@ memcached_return_t memcached_increment_with_initial(memcached_st *memc, offset, initial, expiration, value); } -memcached_return_t memcached_increment_with_initial_by_key(memcached_st *memc, +memcached_return_t memcached_increment_with_initial_by_key(memcached_st *shell, const char *group_key, size_t group_key_length, const char *key, @@ -329,6 +337,7 @@ memcached_return_t memcached_increment_with_initial_by_key(memcached_st *memc, uint64_t *value) { LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); + Memcached* memc= memcached2Memcached(shell); memcached_return_t rc= increment_decrement_with_initial_by_key(PROTOCOL_BINARY_CMD_INCREMENT, memc, group_key, group_key_length, @@ -352,7 +361,7 @@ memcached_return_t memcached_decrement_with_initial(memcached_st *memc, offset, initial, expiration, value); } -memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *memc, +memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *shell, const char *group_key, size_t group_key_length, const char *key, @@ -363,6 +372,7 @@ memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *memc, uint64_t *value) { LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); + Memcached* memc= memcached2Memcached(shell); memcached_return_t rc= increment_decrement_with_initial_by_key(PROTOCOL_BINARY_CMD_DECREMENT, memc, group_key, group_key_length,