X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.hh;h=52ce4105d9ef7a6471816f43719e19c0fb928e02;hb=cb05d3311de7e7ca578bafb116f3c8a56b9f0aa8;hp=55b099453a0c43203e1d388bb0c1313581a40492;hpb=71e7ddb8865ac660dfa6c1f5c11204aa90ba075f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 55b09945..52ce4105 100644
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -1,14 +1,10 @@
-#include "libmemcached/memcached.h"
-#include <string.h>
-#include <stdio.h>
+#include <libmemcached/memcached.h>
 
 #include <string>
+#include <vector>
 
 class Memcached
 {
-  memcached_st memc;
-  memcached_result_st result;
-
 public:
 
   Memcached() 
@@ -32,22 +28,26 @@ public:
     memcached_free(&memc);
   }
 
-  std::string fetch(const std::string& key, size_t *key_length, size_t *value_length)
+  bool fetch(std::string &key, 
+             std::string &ret_val,
+             size_t *key_length, 
+             size_t *value_length,
+             uint32_t *flags,
+             memcached_return *rc)
   {
-    uint32_t flags;
-    memcached_return rc;
-    std::string ret_val;
-
-    char *value= memcached_fetch(&memc, const_cast<char *>(key.c_str()), key_length,
-                                 value_length, &flags, &rc);
+    char ret_key[MEMCACHED_MAX_KEY];
+    char *value= memcached_fetch(&memc, ret_key, key_length,
+                                 value_length, flags, rc);
     if (value)
     {
       ret_val.assign(value);
+      key.assign(ret_key);
+      return true;
     }
-    return ret_val;
+    return false;
   }
 
-  std::string get(const std::string& key, size_t *value_length)
+  std::string get(const std::string &key, size_t *value_length) 
   {
     uint32_t flags;
     memcached_return rc;
@@ -62,9 +62,9 @@ public:
     return ret_val;
   }
 
-  std::string get_by_key(const std::string& master_key, 
-                   const std::string& key, 
-                   size_t *value_length)
+  std::string get_by_key(const std::string &master_key, 
+                         const std::string &key, 
+                         size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
@@ -80,138 +80,274 @@ public:
     return ret_val;
   }
 
-  memcached_return mget(char **keys, size_t *key_length, 
-                        unsigned int number_of_keys)
+  bool mget(std::vector<std::string> &keys)
   {
+    std::vector<const char *> real_keys;
+    std::vector<size_t> key_len;
+    /*
+     * Construct an array which will contain the length
+     * of each of the strings in the input vector. Also, to
+     * interface with the memcached C API, we need to convert
+     * the vector of std::string's to a vector of char *.
+     */
+    real_keys.reserve(keys.size());
+    key_len.reserve(keys.size());
+
+    std::vector<std::string>::iterator it= keys.begin();
+
+    while (it != keys.end())
+    {
+      real_keys.push_back(const_cast<char *>((*it).c_str()));
+      key_len.push_back((*it).length());
+      ++it;
+    }
+
+    /*
+     * 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], 
+                                          static_cast<unsigned int>(real_keys.size()));
+      return (rc == MEMCACHED_SUCCESS);
+    }
 
-    return memcached_mget(&memc, keys, key_length, number_of_keys);
+    return false;
   }
 
-  memcached_return set(const std::string& key, const char *value, size_t value_length)
+  bool set(const std::string &key, 
+           const std::string &value,
+           time_t expiration,
+           uint32_t flags)
   {
-    return memcached_set(&memc, key.c_str(), key.length(),
-                         value, value_length,
-                         time_t(0), uint32_t(0));
+    memcached_return rc= memcached_set(&memc, 
+                                       key.c_str(), key.length(),
+                                       value.c_str(), value.length(),
+                                       expiration, flags);
+    return (rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
   }
 
-  memcached_return set_by_key(const std::string& master_key, 
-                              const std::string& key, 
-                              const char *value, size_t value_length)
+  bool set_all(std::vector<std::string> &keys,
+               std::vector<std::string> &values,
+               time_t expiration,
+               uint32_t flags)
   {
-    return memcached_set_by_key(&memc, master_key.c_str(), 
-                                master_key.length(),
-                                key.c_str(), key.length(),
-                                value, value_length,
-                                time_t(0),
-                                uint32_t(0));
+    if (keys.size() != values.size())
+    {
+      return false;
+    }
+    bool retval= true;
+    std::vector<std::string>::iterator key_it= keys.begin();
+    std::vector<std::string>::iterator val_it= values.begin();
+    while (key_it != keys.end())
+    {
+      retval= set((*key_it), (*val_it), expiration, flags);
+      if (retval == false)
+      {
+        return retval;
+      }
+      ++key_it;
+      ++val_it;
+    }
+    return retval;
+  }
+
+  bool set_by_key(const std::string &master_key, 
+                  const std::string &key, 
+                  const std::string &value,
+                  time_t expiration,
+                  uint32_t flags)
+  {
+    memcached_return rc= memcached_set_by_key(&memc, master_key.c_str(), 
+                                              master_key.length(),
+                                              key.c_str(), key.length(),
+                                              value.c_str(), value.length(),
+                                              expiration,
+                                              flags);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return
-    increment(const std::string& key, unsigned int offset, uint64_t *value)
+  bool increment(const std::string &key, unsigned int offset, uint64_t *value)
   {
-    return memcached_increment(&memc, key.c_str(), key.length(),
-                         offset, value);
+    memcached_return rc= memcached_increment(&memc, key.c_str(), key.length(),
+                                             offset, value);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return
-    decrement(const char *key, unsigned int offset, uint64_t *value)
+  bool decrement(const std::string &key, unsigned int offset, uint64_t *value)
   {
-    return memcached_decrement(&memc, key, strlen(key),
-                         offset, value);
+    memcached_return rc= memcached_decrement(&memc, key.c_str(), 
+                                             key.length(),
+                                             offset, value);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
 
-  memcached_return add(const char *key, const char *value, size_t value_length)
+  bool add(const std::string &key, const std::string &value)
   {
-    return memcached_add(&memc, key, strlen(key), value, value_length, 0, 0);
+    memcached_return rc= memcached_add(&memc, key.c_str(), key.length(), 
+                                       value.c_str(), value.length(), 0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return add_by_key(const char *master_key, const char *key, 
-                              const char *value, size_t value_length)
+  bool add_by_key(const std::string &master_key, 
+                  const std::string &key, 
+                  const std::string &value)
   {
-    return memcached_add_by_key(&memc, master_key, strlen(master_key),
-                                key, strlen(key),
-                                value, value_length,
-                                0, 0);
+    memcached_return rc= memcached_add_by_key(&memc, 
+                                              master_key.c_str(),
+                                              master_key.length(),
+                                              key.c_str(),
+                                              key.length(),
+                                              value.c_str(), 
+                                              value.length(),
+                                              0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return replace(const char *key, const char *value, 
-                           size_t value_length)
+  bool replace(const std::string &key, const std::string &value)
   {
-    return memcached_replace(&memc, key, strlen(key),
-                     value, value_length,
-                     0, 0);
+    memcached_return rc= memcached_replace(&memc, key.c_str(), key.length(),
+                                           value.c_str(), value.length(),
+                                           0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return replace_by_key(const char *master_key, const char *key, 
-                                  const char *value, size_t value_length)
+  bool replace_by_key(const std::string &master_key, 
+                      const std::string &key, 
+                      const std::string &value)
   {
-    return memcached_replace_by_key(&memc, master_key, strlen(master_key),
-                                    key, strlen(key),
-                                    value, value_length, 0, 0);
+    memcached_return rc= memcached_replace_by_key(&memc, 
+                                                  master_key.c_str(), 
+                                                  master_key.length(),
+                                                  key.c_str(), 
+                                                  key.length(),
+                                                  value.c_str(), 
+                                                  value.length(), 
+                                                  0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return prepend(const char *key, const char *value, 
-                           size_t value_length)
+  bool prepend(const std::string &key, const std::string &value)
   {
-    return memcached_prepend(&memc, key, strlen(key),
-                    value, value_length, 0, 0);
+    memcached_return rc= memcached_prepend(&memc, key.c_str(), key.length(),
+                                           value.c_str(), value.length(), 0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return prepend_by_key(const char *master_key, const char *key, 
-                                  const char *value, size_t value_length)
+  bool prepend_by_key(const std::string &master_key, 
+                      const std::string &key, 
+                      const std::string &value)
   {
-    return memcached_prepend_by_key(&memc, master_key, strlen(master_key),
-                                    key, strlen(key),
-                                    value, value_length,
-                                    0,
-                                    0);
+    memcached_return rc= memcached_prepend_by_key(&memc, 
+                                                  master_key.c_str(), 
+                                                  master_key.length(),
+                                                  key.c_str(), 
+                                                  key.length(),
+                                                  value.c_str(), 
+                                                  value.length(),
+                                                  0,
+                                                  0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return  append(const char *key, const char *value, 
-                           size_t value_length)
+  bool append(const std::string &key, const std::string &value)
   {
-    return memcached_append(&memc, key, strlen(key),
-                    value, value_length, 0, 0);
+    memcached_return rc= memcached_append(&memc, 
+                                          key.c_str(), 
+                                          key.length(),
+                                          value.c_str(), 
+                                          value.length(), 
+                                          0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return  append_by_key(const char *master_key, const char *key, 
-                                  const char *value, size_t value_length)
+  bool append_by_key(const std::string &master_key, 
+                     const std::string &key, 
+                     const std::string &value)
   {
-    return memcached_append_by_key(&memc,
-                                   master_key, strlen(master_key),
-                                   key, strlen(key),
-                                   value, value_length, 0, 0);
+    memcached_return rc= memcached_append_by_key(&memc,
+                                                 master_key.c_str(), 
+                                                 master_key.length(),
+                                                 key.c_str(), 
+                                                 key.length(),
+                                                 value.c_str(), 
+                                                 value.length(), 
+                                                 0, 0);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return  cas(const char *key, const char *value, 
-                        size_t value_length, uint64_t cas_arg)
+  bool cas(const std::string &key, 
+           const std::string &value, 
+           uint64_t cas_arg)
   {
-    return memcached_cas(&memc, key, strlen(key),
-                    value, value_length, 0, 0, cas_arg);
+    memcached_return rc= memcached_cas(&memc, key.c_str(), key.length(),
+                                       value.c_str(), value.length(), 
+                                       0, 0, cas_arg);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  memcached_return  cas_by_key(const char *master_key, const char *key, 
-                               const char *value, size_t value_length, 
-                               uint64_t cas_arg)
+  bool cas_by_key(const std::string &master_key, 
+                  const std::string &key, 
+                  const std::string &value, 
+                  uint64_t cas_arg)
   {
-    return memcached_cas_by_key(&memc,
-                                master_key, strlen(master_key),
-                                key, strlen(key),
-                                value, value_length,
-                                0, 0, cas_arg);
+    memcached_return rc= memcached_cas_by_key(&memc,
+                                              master_key.c_str(), 
+                                              master_key.length(),
+                                              key.c_str(), 
+                                              key.length(),
+                                              value.c_str(), 
+                                              value.length(),
+                                              0, 0, cas_arg);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
   // using 'remove' vs. 'delete' since 'delete' is a keyword 
-  memcached_return remove(const char *key)
+  bool remove(const std::string &key)
   {
-    return memcached_delete (&memc, key, strlen(key), 0);
+    memcached_return rc= memcached_delete(&memc, key.c_str(), key.length(), 0);
+    return (rc == MEMCACHED_SUCCESS);
+  }
 
+  bool delete_by_key(const std::string &master_key, 
+                     const std::string &key)
+  {
+    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);
   }
 
-  memcached_return delete_by_key(const char *master_key, const char *key)
+  bool flush(time_t expiration)
   {
-    return memcached_delete_by_key(&memc, master_key, strlen(master_key),
-                           key, strlen(key), 0);
+    memcached_return rc= memcached_flush(&memc, expiration);
+    return (rc == MEMCACHED_SUCCESS);
   }
+
+  bool fetch_execute(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);
+  }
+
+  const std::string lib_version() const
+  {
+    const char *ver= memcached_lib_version();
+    const std::string version(ver);
+    return version;
+  }
+
+private:
+  memcached_st memc;
+  memcached_result_st result;
 };