X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.hpp;h=cd6a18d179f69b6a9c8a5adca115a91d80c9fb77;hb=b764fb28893e62e6616ae09545738c7ceec60f44;hp=46573f4959b2aab0a874da0eae407965fb2360a3;hpb=8cc3921d72dabcc2a89c38bbee08007b7abe6976;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.hpp b/libmemcached/memcached.hpp index 46573f49..cd6a18d1 100644 --- a/libmemcached/memcached.hpp +++ b/libmemcached/memcached.hpp @@ -12,8 +12,7 @@ * @brief Libmemcached C++ interface */ -#ifndef LIBMEMCACHEDPP_H -#define LIBMEMCACHEDPP_H +#pragma once #include #include @@ -36,97 +35,53 @@ class Memcache { public: - Memcache() - : - servers_list(), - memc(), - servers(NULL), - result() + Memcache() { - memcached_create(&memc); + memc= memcached("", 0); } - Memcache(const std::string &in_servers_list) - : - servers_list(in_servers_list), - memc(), - servers(NULL), - result() + Memcache(const std::string &config) { - memcached_create(&memc); - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); + memc= memcached(config.c_str(), config.size()); } - Memcache(const std::string &hostname, - unsigned int port) - : - servers_list(), - memc(), - servers(NULL), - 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()); - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); + memc= memcached("", 0); + if (memc) + memcached_server_add(memc, hostname.c_str(), port); } - Memcache(memcached_st *clone) - : - servers_list(), - memc(), - servers(NULL), - result() + Memcache(memcached_st *clone) { - memcached_clone(&memc, clone); + memc= memcached_clone(NULL, clone); } Memcache(const Memcache &rhs) - : - servers_list(rhs.servers_list), - memc(), - servers(NULL), - result() { - memcached_clone(&memc, const_cast(&rhs.getImpl())); - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); + memc= memcached_clone(NULL, rhs.getImpl()); } Memcache &operator=(const Memcache &rhs) { if (this != &rhs) { - memcached_clone(&memc, const_cast(&rhs.getImpl())); - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); + memcached_free(memc); + memc= memcached_clone(NULL, rhs.getImpl()); } + return *this; } ~Memcache() { - memcached_free(&memc); - memcached_server_list_free(servers); + memcached_free(memc); } /** * Get the internal memcached_st * */ - memcached_st &getImpl() - { - return memc; - } - - /** - * Get the internal memcached_st * - */ - const memcached_st &getImpl() const + const memcached_st *getImpl() const { return memc; } @@ -134,38 +89,35 @@ public: /** * Return an error string for the given return structure. * - * @param[in] rc a memcached_return structure + * @param[in] rc a memcached_return_t structure * @return error string corresponding to given return code in the library. */ - const std::string getError(memcached_return rc) const + const std::string getError(memcached_return_t rc) const { /* first parameter to strerror is unused */ return memcached_strerror(NULL, rc); } - /** - * 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 + + bool setBehavior(memcached_behavior_t flag, uint64_t data) { - return servers_list; + return (memcached_success(memcached_behavior_set(memc, flag, data))); + } + + uint64_t getBehavior(memcached_behavior_t flag) + { + 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); - servers= memcached_servers_parse(in_servers_list.c_str()); - memcached_server_push(&memc, servers); - return (servers == NULL); + return memcached_success(memcached_parse_configuration(memc, configuration.c_str(), configuration.size())); } /** @@ -175,21 +127,9 @@ public: * @param[in] port port number of server to add * @return true on success; false otherwise */ - bool addServer(const std::string &server_name, unsigned int port) + bool addServer(const std::string &server_name, in_port_t port) { - memcached_return rc; - std::ostringstream strstm; - servers_list.append(","); - servers_list.append(server_name); - servers_list.append(":"); - strstm << port; - servers_list.append(strstm.str()); - servers= memcached_server_list_append(servers, - server_name.c_str(), - port, - &rc); - memcached_server_push(&memc, servers); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_server_add(memc, server_name.c_str(), port)); } /** @@ -199,7 +139,7 @@ public: * @param[in] port port number of server to remove * @return true on success; false otherwise */ - bool removeServer(const std::string &server_name, size_t port) + bool removeServer(const std::string &server_name, in_port_t port) { std::string tmp_str; std::ostringstream strstm; @@ -208,9 +148,10 @@ public: tmp_str.append(":"); strstm << port; tmp_str.append(strstm.str()); - memcached_server_st *server= memcached_servers_parse(tmp_str.c_str()); - memcached_return rc= memcached_server_remove(server); - return (rc == MEMCACHED_SUCCESS); + + //memcached_return_t rc= memcached_server_remove(server); + + return false; } /** @@ -221,22 +162,28 @@ public: * @param[out] ret_val store returned object in this vector * @return a memcached return structure */ - memcached_return fetch(std::string &key, + memcached_return_t fetch(std::string &key, std::vector &ret_val) { char ret_key[MEMCACHED_MAX_KEY]; size_t value_length= 0; size_t key_length= 0; - memcached_return rc; + memcached_return_t rc; uint32_t flags= 0; - char *value= memcached_fetch(&memc, ret_key, &key_length, + 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.assign(ret_key, key_length); + free(value); + } + else if (value) + { + free(value); } + return rc; } @@ -248,23 +195,19 @@ 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 rc; + 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()) { ret_val.reserve(value_length); ret_val.assign(value, value + value_length); + free(value); return true; } return false; @@ -273,7 +216,7 @@ public: /** * Fetches an individual from a server which is specified by * the master_key parameter that is used for determining which - * server an object was stored in if key partitioning was + * server an object was stored in if key partitioning was * used for storage. * * @param[in] master_key key that specifies server object is stored on @@ -282,19 +225,15 @@ public: * this vector * @return true on success; false otherwise */ - bool getByKey(const std::string &master_key, - const std::string &key, - std::vector &ret_val) throw(Error) + bool getByKey(const std::string &master_key, + const std::string &key, + std::vector &ret_val) { uint32_t flags= 0; - memcached_return rc; + 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); @@ -302,6 +241,7 @@ public: { ret_val.reserve(value_length); ret_val.assign(value, value + value_length); + free(value); return true; } return false; @@ -337,14 +277,12 @@ public: } /* - * If the std::vector of keys is empty then we cannot + * 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 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; @@ -364,16 +302,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 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); } @@ -388,25 +322,18 @@ public: * @param[in] flags flags to store with the object * @return true on succcess; false otherwise */ - bool setByKey(const std::string &master_key, - const std::string &key, + bool setByKey(const std::string &master_key, + 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 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)); } /** @@ -422,12 +349,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(); @@ -455,23 +378,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; } @@ -488,15 +406,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 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)); } /** @@ -510,16 +422,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 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)); } @@ -532,15 +438,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 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)); } /** @@ -553,25 +453,18 @@ public: * @param[in] value of object to add * @return true on success; false otherwise */ - bool addByKey(const std::string &master_key, - const std::string &key, - const std::vector &value) throw(Error) + bool addByKey(const std::string &master_key, + 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 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)); } /** @@ -582,17 +475,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 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)); } /** @@ -605,25 +492,18 @@ public: * @param[in[ value value to replace object with * @return true on success; false otherwise */ - bool replaceByKey(const std::string &master_key, - const std::string &key, + bool replaceByKey(const std::string &master_key, + 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 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)); } /** @@ -634,15 +514,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 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)); } /** @@ -655,27 +529,19 @@ public: * @param[in] value data to prepend to object's value * @return true on success; false otherwise */ - bool prependByKey(const std::string &master_key, - const std::string &key, + 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 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)); } /** @@ -686,19 +552,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 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)); } /** @@ -714,23 +574,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 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)); } /** @@ -741,18 +593,13 @@ public: * @param[in] value value to store for object in server * @param[in] cas_arg "cas" value */ - bool cas(const std::string &key, - const std::vector &value, - uint64_t cas_arg) throw(Error) + bool cas(const std::string &key, + const std::vector &value, + uint64_t cas_arg) { - if (key.empty() || value.empty()) - { - throw(Error("the key or value supplied is empty!", false)); - } - memcached_return 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)); } /** @@ -765,26 +612,19 @@ public: * @param[in] value value to store for object in server * @param[in] cas_arg "cas" value */ - bool casByKey(const std::string &master_key, - const std::string &key, - const std::vector &value, - uint64_t cas_arg) throw(Error) + bool casByKey(const std::string &master_key, + const std::string &key, + const std::vector &value, + 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 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)); } /** @@ -793,14 +633,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 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)); } /** @@ -810,66 +645,50 @@ 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 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)); } /** - * Delete an object from the server specified by the key given. + * Delete an object from the server specified by the key given. * * @param[in] master_key specifies server to remove object from * @param[in] key key of object to delete * @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 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)); } /** - * Delete an object from the server specified by the key given. + * Delete an object from the server specified by the key given. * * @param[in] master_key specifies server to remove object from * @param[in] key key of object to delete * @param[in] expiration time to delete the object after * @return true on success; false otherwise */ - bool removeByKey(const std::string &master_key, + 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 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)); } /** @@ -881,29 +700,7 @@ public: */ bool flush(time_t expiration) { - memcached_return 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_function *callback, - void *context, - unsigned int num_of_callbacks) - { - memcached_return rc= memcached_fetch_execute(&memc, - callback, - context, - num_of_callbacks); - return (rc == MEMCACHED_SUCCESS); + return memcached_success(memcached_flush(memc, expiration)); } /** @@ -917,14 +714,64 @@ public: return version; } -private: + /** + * Retrieve memcached statistics. Populate a std::map with the retrieved + * stats. Each server will map to another std::map of the key:value stats. + * + * @param[out] stats_map a std::map to be populated with the memcached + * stats + * @return true on success; false otherwise + */ + bool getStats(std::map< std::string, std::map > + &stats_map) + { + memcached_return_t rc; + memcached_stat_st *stats= memcached_stat(memc, NULL, &rc); + + if (rc != MEMCACHED_SUCCESS && + rc != MEMCACHED_SOME_ERRORS) + { + return false; + } + + uint32_t server_count= memcached_server_count(memc); - std::string servers_list; - memcached_st memc; - memcached_server_st *servers; - memcached_result_st result; + /* + * For each memcached server, construct a std::map for its stats and add + * it to the std::map of overall stats. + */ + for (uint32_t x= 0; x < server_count; x++) + { + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, x); + std::ostringstream strstm; + std::string server_name(memcached_server_name(instance)); + server_name.append(":"); + strstm << memcached_server_port(instance); + server_name.append(strstm.str()); + + std::map server_stats; + char **list= NULL; + char **ptr= NULL; + + 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); + server_stats[*ptr]= value; + free(value); + } + + stats_map[server_name]= server_stats; + free(list); + } + + memcached_stat_free(memc, stats); + return true; + } + +private: + memcached_st *memc; }; } - -#endif /* LIBMEMCACHEDPP_H */