X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.hpp;h=a83902622495994ed6beab230309023cd9678a2f;hb=09ef521d2c88955d04d6c91f7b5a1671a1955130;hp=d7086b4ce301ea11a876fdcb3a20f8b0831a009a;hpb=f6c04131cc9952372e3f63de2db4edc9f8181fb2;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.hpp b/libmemcached/memcached.hpp index d7086b4c..a8390262 100644 --- a/libmemcached/memcached.hpp +++ b/libmemcached/memcached.hpp @@ -36,11 +36,10 @@ class Memcache { public: - Memcache() - : + Memcache() + : servers_list(), memc(), - servers(NULL), result() { memcached_create(&memc); @@ -50,37 +49,34 @@ public: : servers_list(in_servers_list), memc(), - servers(NULL), result() { memcached_create(&memc); - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); + init(); } Memcache(const std::string &hostname, - unsigned int port) + in_port_t port) : servers_list(), memc(), - servers(NULL), result() { 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); + + init(); } - Memcache(memcached_st *clone) - : + Memcache(memcached_st *clone) + : servers_list(), memc(), - servers(NULL), result() { memcached_clone(&memc, clone); @@ -90,12 +86,10 @@ public: : 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); + init(); } Memcache &operator=(const Memcache &rhs) @@ -103,16 +97,23 @@ public: if (this != &rhs) { memcached_clone(&memc, const_cast(&rhs.getImpl())); - servers= memcached_servers_parse(servers_list.c_str()); - memcached_server_push(&memc, servers); + init(); } + return *this; } ~Memcache() { memcached_free(&memc); - memcached_server_list_free(servers); + } + + void init() + { + memcached_server_st *servers; + servers= memcached_servers_parse(servers_list.c_str()); + memcached_server_push(&memc, servers); + memcached_server_free(servers); } /** @@ -134,15 +135,27 @@ 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); } + + bool setBehavior(memcached_behavior_t flag, uint64_t data) + { + memcached_return_t rc; + rc= memcached_behavior_set(&memc, flag, data); + return (rc == MEMCACHED_SUCCESS); + } + + 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. @@ -163,9 +176,9 @@ public: bool setServers(const std::string &in_servers_list) { servers_list.assign(in_servers_list); - servers= memcached_servers_parse(in_servers_list.c_str()); - memcached_server_push(&memc, servers); - return (servers == NULL); + init(); + + return (memcached_server_count(&memc)); } /** @@ -175,20 +188,12 @@ 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); + memcached_return_t rc; + + rc= memcached_server_add(&memc, server_name.c_str(), port); + return (rc == MEMCACHED_SUCCESS); } @@ -199,7 +204,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 +213,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,13 +227,13 @@ 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, &value_length, &flags, &rc); @@ -254,11 +260,11 @@ public: * this vector * @return true on success; false otherwise */ - bool get(const std::string &key, + bool get(const std::string &key, std::vector &ret_val) throw (Error) { uint32_t flags= 0; - memcached_return rc; + memcached_return_t rc; size_t value_length= 0; if (key.empty()) @@ -280,7 +286,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 @@ -289,12 +295,12 @@ public: * this vector * @return true on success; false otherwise */ - bool getByKey(const std::string &master_key, - const std::string &key, + bool getByKey(const std::string &master_key, + const std::string &key, std::vector &ret_val) throw(Error) { uint32_t flags= 0; - memcached_return rc; + memcached_return_t rc; size_t value_length= 0; if (master_key.empty() || key.empty()) @@ -345,12 +351,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()) { - memcached_return rc= memcached_mget(&memc, &real_keys[0], &key_len[0], + memcached_return_t rc= memcached_mget(&memc, &real_keys[0], &key_len[0], real_keys.size()); return (rc == MEMCACHED_SUCCESS); } @@ -378,7 +384,7 @@ public: { throw(Error("the key or value supplied is empty!", false)); } - memcached_return rc= memcached_set(&memc, + memcached_return_t rc= memcached_set(&memc, key.c_str(), key.length(), &value[0], value.size(), expiration, flags); @@ -396,8 +402,8 @@ 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) @@ -408,7 +414,7 @@ public: { throw(Error("the key or value supplied is empty!", false)); } - memcached_return rc= memcached_set_by_key(&memc, master_key.c_str(), + 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(), @@ -502,7 +508,7 @@ public: { throw(Error("the key supplied is empty!", false)); } - memcached_return rc= memcached_increment(&memc, key.c_str(), key.length(), + memcached_return_t rc= memcached_increment(&memc, key.c_str(), key.length(), offset, value); return (rc == MEMCACHED_SUCCESS); } @@ -524,7 +530,7 @@ public: { throw(Error("the key supplied is empty!", false)); } - memcached_return rc= memcached_decrement(&memc, key.c_str(), + memcached_return_t rc= memcached_decrement(&memc, key.c_str(), key.length(), offset, value); return (rc == MEMCACHED_SUCCESS); @@ -546,7 +552,7 @@ public: { throw(Error("the key or value supplied is empty!", false)); } - memcached_return rc= memcached_add(&memc, key.c_str(), key.length(), + memcached_return_t rc= memcached_add(&memc, key.c_str(), key.length(), &value[0], value.size(), 0, 0); return (rc == MEMCACHED_SUCCESS); } @@ -561,22 +567,22 @@ 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, + bool addByKey(const std::string &master_key, + const std::string &key, const std::vector &value) throw(Error) { if (master_key.empty() || - 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, + memcached_return_t rc= memcached_add_by_key(&memc, master_key.c_str(), master_key.length(), key.c_str(), key.length(), - &value[0], + &value[0], value.size(), 0, 0); return (rc == MEMCACHED_SUCCESS); @@ -597,7 +603,7 @@ public: { throw(Error("the key or value supplied is empty!", false)); } - memcached_return rc= memcached_replace(&memc, key.c_str(), key.length(), + memcached_return_t rc= memcached_replace(&memc, key.c_str(), key.length(), &value[0], value.size(), 0, 0); return (rc == MEMCACHED_SUCCESS); @@ -613,8 +619,8 @@ 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() || @@ -623,13 +629,13 @@ public: { throw(Error("the master key or key supplied is empty!", false)); } - memcached_return rc= memcached_replace_by_key(&memc, - master_key.c_str(), + memcached_return_t rc= memcached_replace_by_key(&memc, + master_key.c_str(), master_key.length(), - key.c_str(), + key.c_str(), key.length(), - &value[0], - value.size(), + &value[0], + value.size(), 0, 0); return (rc == MEMCACHED_SUCCESS); } @@ -648,7 +654,7 @@ public: { throw(Error("the key or value supplied is empty!", false)); } - memcached_return rc= memcached_prepend(&memc, key.c_str(), key.length(), + memcached_return_t rc= memcached_prepend(&memc, key.c_str(), key.length(), &value[0], value.size(), 0, 0); return (rc == MEMCACHED_SUCCESS); } @@ -663,8 +669,8 @@ 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) { @@ -674,7 +680,7 @@ public: { throw(Error("the master key or key supplied is empty!", false)); } - memcached_return rc= memcached_prepend_by_key(&memc, + memcached_return_t rc= memcached_prepend_by_key(&memc, master_key.c_str(), master_key.length(), key.c_str(), @@ -700,7 +706,7 @@ public: { throw(Error("the key or value supplied is empty!", false)); } - memcached_return rc= memcached_append(&memc, + memcached_return_t rc= memcached_append(&memc, key.c_str(), key.length(), &value[0], @@ -730,13 +736,13 @@ public: { throw(Error("the master key or key supplied is empty!", false)); } - memcached_return rc= memcached_append_by_key(&memc, - master_key.c_str(), + memcached_return_t rc= memcached_append_by_key(&memc, + master_key.c_str(), master_key.length(), - key.c_str(), + key.c_str(), key.length(), - &value[0], - value.size(), + &value[0], + value.size(), 0, 0); return (rc == MEMCACHED_SUCCESS); } @@ -749,16 +755,16 @@ 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, + bool cas(const std::string &key, + const std::vector &value, uint64_t cas_arg) throw(Error) { 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(), + memcached_return_t rc= memcached_cas(&memc, key.c_str(), key.length(), + &value[0], value.size(), 0, 0, cas_arg); return (rc == MEMCACHED_SUCCESS); } @@ -773,9 +779,9 @@ 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, + bool casByKey(const std::string &master_key, + const std::string &key, + const std::vector &value, uint64_t cas_arg) throw(Error) { if (master_key.empty() || @@ -784,12 +790,12 @@ public: { throw(Error("the master key, key or value supplied is empty!", false)); } - memcached_return rc= memcached_cas_by_key(&memc, - master_key.c_str(), + memcached_return_t rc= memcached_cas_by_key(&memc, + master_key.c_str(), master_key.length(), - key.c_str(), + key.c_str(), key.length(), - &value[0], + &value[0], value.size(), 0, 0, cas_arg); return (rc == MEMCACHED_SUCCESS); @@ -807,7 +813,7 @@ public: { throw(Error("the key supplied is empty!", false)); } - memcached_return rc= memcached_delete(&memc, key.c_str(), key.length(), 0); + memcached_return_t rc= memcached_delete(&memc, key.c_str(), key.length(), 0); return (rc == MEMCACHED_SUCCESS); } @@ -825,7 +831,7 @@ public: { throw(Error("the key supplied is empty!", false)); } - memcached_return rc= memcached_delete(&memc, + memcached_return_t rc= memcached_delete(&memc, key.c_str(), key.length(), expiration); @@ -833,7 +839,7 @@ public: } /** - * 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 @@ -846,7 +852,7 @@ public: { throw(Error("the master key or key supplied is empty!", false)); } - memcached_return rc= memcached_delete_by_key(&memc, + memcached_return_t rc= memcached_delete_by_key(&memc, master_key.c_str(), master_key.length(), key.c_str(), @@ -856,14 +862,14 @@ public: } /** - * 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) { @@ -871,11 +877,11 @@ public: { throw(Error("the master key or key supplied is empty!", false)); } - memcached_return rc= memcached_delete_by_key(&memc, - master_key.c_str(), + memcached_return_t rc= memcached_delete_by_key(&memc, + master_key.c_str(), master_key.length(), - key.c_str(), - key.length(), + key.c_str(), + key.length(), expiration); return (rc == MEMCACHED_SUCCESS); } @@ -889,7 +895,7 @@ public: */ bool flush(time_t expiration) { - memcached_return rc= memcached_flush(&memc, expiration); + memcached_return_t rc= memcached_flush(&memc, expiration); return (rc == MEMCACHED_SUCCESS); } @@ -903,11 +909,11 @@ public: * @param[in] num_of_callbacks number of callback functions * @return true on success; false otherwise */ - bool fetchExecute(memcached_execute_function *callback, + bool fetchExecute(memcached_execute_fn *callback, void *context, - unsigned int num_of_callbacks) + uint32_t num_of_callbacks) { - memcached_return rc= memcached_fetch_execute(&memc, + memcached_return_t rc= memcached_fetch_execute(&memc, callback, context, num_of_callbacks); @@ -936,7 +942,7 @@ public: bool getStats(std::map< std::string, std::map > &stats_map) { - memcached_return rc; + memcached_return_t rc; memcached_stat_st *stats= memcached_stat(&memc, NULL, &rc); if (rc != MEMCACHED_SUCCESS && @@ -953,10 +959,12 @@ public: */ 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(&memc, servers[x])); + std::string server_name(memcached_server_name(instance)); server_name.append(":"); - strstm << memcached_server_port(&memc, servers[x]); + strstm << memcached_server_port(instance); server_name.append(strstm.str()); std::map server_stats; @@ -970,7 +978,7 @@ public: server_stats[*ptr]= value; free(value); } - + stats_map[server_name]= server_stats; free(list); } @@ -983,7 +991,6 @@ private: std::string servers_list; memcached_st memc; - memcached_server_st *servers; memcached_result_st result; };