X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.hpp;h=58fff4df7fcc0401f8b2c738bf32d51cf96cb5cb;hb=04b8554c3724eae57fbd75dc6b3e69dca8b58187;hp=55f96c7ea7a18952142d21ae3d0963b5e827e295;hpb=a68b22348553017dffa5e7b35b11d1464e7ca3c7;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.hpp b/libmemcached/memcached.hpp index 55f96c7e..58fff4df 100644 --- a/libmemcached/memcached.hpp +++ b/libmemcached/memcached.hpp @@ -13,8 +13,6 @@ */ #pragma once -#ifndef LIBMEMCACHEDPP_H -#define LIBMEMCACHEDPP_H #include #include @@ -38,67 +36,38 @@ class Memcache public: Memcache() - : - servers_list(), - memc(), - result() { - memcached_create(&memc); + memc= memcached("", 0); } - Memcache(const std::string &in_servers_list) - : - servers_list(in_servers_list), - memc(), - result() + Memcache(const std::string &config) { - memcached_create(&memc); - init(); + memc= memcached(config.c_str(), config.size()); } - Memcache(const std::string &hostname, - in_port_t port) - : - servers_list(), - memc(), - result() + Memcache(const std::string &hostname, in_port_t port) { - memcached_create(&memc); - - servers_list.append(hostname); - servers_list.append(":"); - std::ostringstream strsmt; - strsmt << port; - servers_list.append(strsmt.str()); - - init(); + memc= memcached("", 0); + if (memc) + memcached_server_add(memc, hostname.c_str(), port); } Memcache(memcached_st *clone) - : - servers_list(), - memc(), - result() { - memcached_clone(&memc, clone); + memc= memcached_clone(NULL, clone); } Memcache(const Memcache &rhs) - : - servers_list(rhs.servers_list), - memc(), - result() { - memcached_clone(&memc, const_cast(&rhs.getImpl())); - init(); + memc= memcached_clone(NULL, rhs.getImpl()); } Memcache &operator=(const Memcache &rhs) { if (this != &rhs) { - memcached_clone(&memc, const_cast(&rhs.getImpl())); - init(); + memcached_free(memc); + memc= memcached_clone(NULL, rhs.getImpl()); } return *this; @@ -106,29 +75,13 @@ public: ~Memcache() { - memcached_free(&memc); - } - - void init() - { - memcached_server_st *servers; - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); - memcached_server_free(servers); - } - - /** - * Get the internal memcached_st * - */ - memcached_st &getImpl() - { - return memc; + memcached_free(memc); } /** * Get the internal memcached_st * */ - const memcached_st &getImpl() const + const memcached_st *getImpl() const { return memc; } @@ -148,38 +101,33 @@ public: bool setBehavior(memcached_behavior_t flag, uint64_t data) { - memcached_return_t rc; - rc= memcached_behavior_set(&memc, flag, data); - return (rc == MEMCACHED_SUCCESS); + return (memcached_success(memcached_behavior_set(memc, flag, data))); } - uint64_t getBehavior(memcached_behavior_t flag) { - return memcached_behavior_get(&memc, flag); - } - - /** - * Return the string which contains the list of memcached servers being - * used. - * - * @return a std::string containing the list of memcached servers - */ - const std::string getServersList() const + uint64_t getBehavior(memcached_behavior_t flag) { - return servers_list; + return memcached_behavior_get(memc, flag); } /** - * Set the list of memcached servers to use. + * Configure the memcache object * - * @param[in] in_servers_list list of servers + * @param[in] in_config configuration * @return true on success; false otherwise */ - bool setServers(const std::string &in_servers_list) + bool configure(const std::string &configuration) { - servers_list.assign(in_servers_list); - init(); + memcached_st *new_memc= memcached(configuration.c_str(), configuration.size()); - return (memcached_server_count(&memc)); + if (new_memc) + { + memcached_free(memc); + memc= new_memc; + + return true; + } + + return false; } /** @@ -191,11 +139,7 @@ public: */ bool addServer(const std::string &server_name, in_port_t port) { - memcached_return_t rc; - - rc= memcached_server_add(&memc, server_name.c_str(), port); - - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_server_add(memc, server_name.c_str(), port)); } /** @@ -229,30 +173,41 @@ public: * @return a memcached return structure */ memcached_return_t fetch(std::string &key, - std::vector &ret_val) + std::vector &ret_val, + uint32_t &flags, + uint64_t &cas_value) { - char ret_key[MEMCACHED_MAX_KEY]; - size_t value_length= 0; - size_t key_length= 0; memcached_return_t rc; - uint32_t flags= 0; - char *value= memcached_fetch(&memc, ret_key, &key_length, - &value_length, &flags, &rc); - if (value && ret_val.empty()) - { - ret_val.reserve(value_length); - ret_val.assign(value, value + value_length); - key.assign(ret_key, key_length); - free(value); - } - else if (value) + + memcached_result_st *result; + if ((result= memcached_fetch_result(memc, NULL, &rc))) { - free(value); + // Key + key.assign(memcached_result_key_value(result), memcached_result_key_length(result)); + + // Actual value, null terminated + ret_val.reserve(memcached_result_length(result) +1); + ret_val.assign(memcached_result_value(result), + memcached_result_value(result) +memcached_result_length(result)); + + // Misc + flags= memcached_result_flags(result); + cas_value= memcached_result_cas(result); } + memcached_result_free(result); return rc; } + memcached_return_t fetch(std::string &key, + std::vector &ret_val) + { + uint32_t flags= 0; + uint64_t cas_value= 0; + + return fetch(key, ret_val, flags, cas_value); + } + /** * Fetches an individual value from the server. * @@ -261,18 +216,13 @@ public: * this vector * @return true on success; false otherwise */ - bool get(const std::string &key, - std::vector &ret_val) throw (Error) + bool get(const std::string &key, std::vector &ret_val) { uint32_t flags= 0; memcached_return_t rc; size_t value_length= 0; - if (key.empty()) - { - throw(Error("the key supplied is empty!", false)); - } - char *value= memcached_get(&memc, key.c_str(), key.length(), + char *value= memcached_get(memc, key.c_str(), key.length(), &value_length, &flags, &rc); if (value != NULL && ret_val.empty()) { @@ -281,6 +231,7 @@ public: free(value); return true; } + return false; } @@ -298,17 +249,13 @@ public: */ bool getByKey(const std::string &master_key, const std::string &key, - std::vector &ret_val) throw(Error) + std::vector &ret_val) { uint32_t flags= 0; memcached_return_t rc; size_t value_length= 0; - if (master_key.empty() || key.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - char *value= memcached_get_by_key(&memc, + char *value= memcached_get_by_key(memc, master_key.c_str(), master_key.length(), key.c_str(), key.length(), &value_length, &flags, &rc); @@ -355,11 +302,9 @@ public: * If the std::vector of keys is empty then we cannot * call memcached_mget as we will get undefined behavior. */ - if (! real_keys.empty()) + if (not real_keys.empty()) { - memcached_return_t rc= memcached_mget(&memc, &real_keys[0], &key_len[0], - real_keys.size()); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_mget(memc, &real_keys[0], &key_len[0], real_keys.size())); } return false; @@ -379,16 +324,12 @@ public: bool set(const std::string &key, const std::vector &value, time_t expiration, - uint32_t flags) throw(Error) + uint32_t flags) { - if (key.empty() || value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_set(&memc, - key.c_str(), key.length(), - &value[0], value.size(), - expiration, flags); + memcached_return_t rc= memcached_set(memc, + key.c_str(), key.length(), + &value[0], value.size(), + expiration, flags); return (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } @@ -407,21 +348,14 @@ public: const std::string &key, const std::vector &value, time_t expiration, - uint32_t flags) throw(Error) + uint32_t flags) { - if (master_key.empty() || - key.empty() || - value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_set_by_key(&memc, master_key.c_str(), - master_key.length(), - key.c_str(), key.length(), - &value[0], value.size(), - expiration, - flags); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_set_by_key(memc, master_key.c_str(), + master_key.length(), + key.c_str(), key.length(), + &value[0], value.size(), + expiration, + flags)); } /** @@ -437,12 +371,8 @@ public: bool setAll(std::vector &keys, std::vector< std::vector *> &values, time_t expiration, - uint32_t flags) throw(Error) + uint32_t flags) { - if (keys.size() != values.size()) - { - throw(Error("The number of keys and values do not match!", false)); - } bool retval= true; std::vector::iterator key_it= keys.begin(); std::vector< std::vector *>::iterator val_it= values.begin(); @@ -470,23 +400,18 @@ public: */ bool setAll(std::map > &key_value_map, time_t expiration, - uint32_t flags) throw(Error) + uint32_t flags) { - if (key_value_map.empty()) - { - throw(Error("The key/values are not properly set!", false)); - } bool retval= true; - std::map >::iterator it= - key_value_map.begin(); + std::map >::iterator it= key_value_map.begin(); + while (it != key_value_map.end()) { retval= set(it->first, it->second, expiration, flags); if (retval == false) { - std::string err_buff("There was an error setting the key "); - err_buff.append(it->first); - throw(Error(err_buff, false)); + // We should tell the user what the key that failed was + return false; } ++it; } @@ -503,15 +428,9 @@ public: * @param[out] value store the result of the increment here * @return true on success; false otherwise */ - bool increment(const std::string &key, uint32_t offset, uint64_t *value) throw(Error) + bool increment(const std::string &key, uint32_t offset, uint64_t *value) { - if (key.empty()) - { - throw(Error("the key supplied is empty!", false)); - } - memcached_return_t rc= memcached_increment(&memc, key.c_str(), key.length(), - offset, value); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_increment(memc, key.c_str(), key.length(), offset, value)); } /** @@ -525,16 +444,10 @@ public: * @return true on success; false otherwise */ bool decrement(const std::string &key, uint32_t offset, uint64_t *value) - throw(Error) { - if (key.empty()) - { - throw(Error("the key supplied is empty!", false)); - } - memcached_return_t rc= memcached_decrement(&memc, key.c_str(), - key.length(), - offset, value); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_decrement(memc, key.c_str(), + key.length(), + offset, value)); } @@ -547,15 +460,9 @@ public: * @return true on success; false otherwise */ bool add(const std::string &key, const std::vector &value) - throw(Error) { - if (key.empty() || value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_add(&memc, key.c_str(), key.length(), - &value[0], value.size(), 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_add(memc, key.c_str(), key.length(), + &value[0], value.size(), 0, 0)); } /** @@ -570,23 +477,16 @@ public: */ bool addByKey(const std::string &master_key, const std::string &key, - const std::vector &value) throw(Error) + const std::vector &value) { - if (master_key.empty() || - key.empty() || - value.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - memcached_return_t rc= memcached_add_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - &value[0], - value.size(), - 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_add_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + &value[0], + value.size(), + 0, 0)); } /** @@ -597,17 +497,11 @@ public: * @param[in[ value value to replace object with * @return true on success; false otherwise */ - bool replace(const std::string &key, const std::vector &value) throw(Error) + bool replace(const std::string &key, const std::vector &value) { - if (key.empty() || - value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_replace(&memc, key.c_str(), key.length(), - &value[0], value.size(), - 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_replace(memc, key.c_str(), key.length(), + &value[0], value.size(), + 0, 0)); } /** @@ -624,21 +518,14 @@ public: const std::string &key, const std::vector &value) { - if (master_key.empty() || - key.empty() || - value.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - memcached_return_t rc= memcached_replace_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - &value[0], - value.size(), - 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_replace_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + &value[0], + value.size(), + 0, 0)); } /** @@ -649,15 +536,9 @@ public: * @return true on success; false otherwise */ bool prepend(const std::string &key, const std::vector &value) - throw(Error) { - if (key.empty() || value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_prepend(&memc, key.c_str(), key.length(), - &value[0], value.size(), 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_prepend(memc, key.c_str(), key.length(), + &value[0], value.size(), 0, 0)); } /** @@ -673,24 +554,16 @@ public: bool prependByKey(const std::string &master_key, const std::string &key, const std::vector &value) - throw(Error) { - if (master_key.empty() || - key.empty() || - value.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - memcached_return_t rc= memcached_prepend_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - &value[0], - value.size(), - 0, - 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_prepend_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + &value[0], + value.size(), + 0, + 0)); } /** @@ -701,19 +574,13 @@ public: * @return true on success; false otherwise */ bool append(const std::string &key, const std::vector &value) - throw(Error) { - if (key.empty() || value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_append(&memc, - key.c_str(), - key.length(), - &value[0], - value.size(), - 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_append(memc, + key.c_str(), + key.length(), + &value[0], + value.size(), + 0, 0)); } /** @@ -729,23 +596,15 @@ public: bool appendByKey(const std::string &master_key, const std::string &key, const std::vector &value) - throw(Error) { - if (master_key.empty() || - key.empty() || - value.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - memcached_return_t rc= memcached_append_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - &value[0], - value.size(), - 0, 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_append_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + &value[0], + value.size(), + 0, 0)); } /** @@ -758,16 +617,11 @@ public: */ bool cas(const std::string &key, const std::vector &value, - uint64_t cas_arg) throw(Error) + uint64_t cas_arg) { - if (key.empty() || value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_cas(&memc, key.c_str(), key.length(), - &value[0], value.size(), - 0, 0, cas_arg); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_cas(memc, key.c_str(), key.length(), + &value[0], value.size(), + 0, 0, cas_arg)); } /** @@ -783,23 +637,16 @@ public: bool casByKey(const std::string &master_key, const std::string &key, const std::vector &value, - uint64_t cas_arg) throw(Error) + uint64_t cas_arg) { - if (master_key.empty() || - key.empty() || - value.empty()) - { - throw(Error("the master key, key or value supplied is empty!", false)); - } - memcached_return_t rc= memcached_cas_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - &value[0], - value.size(), - 0, 0, cas_arg); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_cas_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + &value[0], + value.size(), + 0, 0, cas_arg)); } /** @@ -808,14 +655,9 @@ public: * @param[in] key key of object to delete * @return true on success; false otherwise */ - bool remove(const std::string &key) throw(Error) + bool remove(const std::string &key) { - if (key.empty()) - { - throw(Error("the key supplied is empty!", false)); - } - memcached_return_t rc= memcached_delete(&memc, key.c_str(), key.length(), 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_delete(memc, key.c_str(), key.length(), 0)); } /** @@ -825,18 +667,12 @@ public: * @param[in] expiration time to delete the object after * @return true on success; false otherwise */ - bool remove(const std::string &key, - time_t expiration) throw(Error) + bool remove(const std::string &key, time_t expiration) { - if (key.empty()) - { - throw(Error("the key supplied is empty!", false)); - } - memcached_return_t rc= memcached_delete(&memc, - key.c_str(), - key.length(), - expiration); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_delete(memc, + key.c_str(), + key.length(), + expiration)); } /** @@ -847,19 +683,14 @@ public: * @return true on success; false otherwise */ bool removeByKey(const std::string &master_key, - const std::string &key) throw(Error) + const std::string &key) { - if (master_key.empty() || key.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - memcached_return_t rc= memcached_delete_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - 0); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_delete_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + 0)); } /** @@ -872,19 +703,14 @@ public: */ bool removeByKey(const std::string &master_key, const std::string &key, - time_t expiration) throw(Error) + time_t expiration) { - if (master_key.empty() || key.empty()) - { - throw(Error("the master key or key supplied is empty!", false)); - } - memcached_return_t rc= memcached_delete_by_key(&memc, - master_key.c_str(), - master_key.length(), - key.c_str(), - key.length(), - expiration); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_delete_by_key(memc, + master_key.c_str(), + master_key.length(), + key.c_str(), + key.length(), + expiration)); } /** @@ -894,31 +720,9 @@ public: * memcached servers * @return true on success; false otherwise */ - bool flush(time_t expiration) + bool flush(time_t expiration= 0) { - memcached_return_t rc= memcached_flush(&memc, expiration); - return (rc == MEMCACHED_SUCCESS); - } - - /** - * Callback function for result sets. It passes the result - * sets to the list of functions provided. - * - * @param[in] callback list of callback functions - * @param[in] context pointer to memory reference that is - * supplied to the calling function - * @param[in] num_of_callbacks number of callback functions - * @return true on success; false otherwise - */ - bool fetchExecute(memcached_execute_fn *callback, - void *context, - uint32_t num_of_callbacks) - { - memcached_return_t rc= memcached_fetch_execute(&memc, - callback, - context, - num_of_callbacks); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_flush(memc, expiration)); } /** @@ -944,7 +748,7 @@ public: &stats_map) { memcached_return_t rc; - memcached_stat_st *stats= memcached_stat(&memc, NULL, &rc); + memcached_stat_st *stats= memcached_stat(memc, NULL, &rc); if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_SOME_ERRORS) @@ -952,7 +756,7 @@ public: return false; } - uint32_t server_count= memcached_server_count(&memc); + uint32_t server_count= memcached_server_count(memc); /* * For each memcached server, construct a std::map for its stats and add @@ -961,7 +765,7 @@ public: for (uint32_t x= 0; x < server_count; x++) { memcached_server_instance_st instance= - memcached_server_instance_by_position(&memc, x); + memcached_server_instance_by_position(memc, x); std::ostringstream strstm; std::string server_name(memcached_server_name(instance)); server_name.append(":"); @@ -972,10 +776,10 @@ public: char **list= NULL; char **ptr= NULL; - list= memcached_stat_get_keys(&memc, &stats[x], &rc); + list= memcached_stat_get_keys(memc, &stats[x], &rc); for (ptr= list; *ptr; ptr++) { - char *value= memcached_stat_get_value(&memc, &stats[x], *ptr, &rc); + char *value= memcached_stat_get_value(memc, &stats[x], *ptr, &rc); server_stats[*ptr]= value; free(value); } @@ -984,17 +788,12 @@ public: free(list); } - memcached_stat_free(&memc, stats); + memcached_stat_free(memc, stats); return true; } private: - - std::string servers_list; - memcached_st memc; - memcached_result_st result; + memcached_st *memc; }; } - -#endif /* LIBMEMCACHEDPP_H */