Merge from monty.

[m6w6/libmemcached] / libmemcached / memcached.hh

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 651c4a2c41520c312b601290837b21c70d38404a..52ce4105d9ef7a6471816f43719e19c0fb928e02 100644 (file)
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -28,19 +28,23 @@ public:
     memcached_free(&memc);
   }
 
-  std::string fetch(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) 
@@ -78,24 +82,23 @@ public:
 
   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 *.
      */
-    size_t *key_len= static_cast<size_t *>(malloc(keys.size() * sizeof(size_t)));
-    if (key_len == NULL)
-    {
-      return false;
-    }
-    std::vector<char *> real_keys;
+    real_keys.reserve(keys.size());
+    key_len.reserve(keys.size());
+
     std::vector<std::string>::iterator it= keys.begin();
-    int i= 0;
+
     while (it != keys.end())
     {
       real_keys.push_back(const_cast<char *>((*it).c_str()));
-      key_len[i++]= (*it).length();
+      key_len.push_back((*it).length());
       ++it;
     }
 
@@ -105,7 +108,7 @@ public:
      */
     if (!real_keys.empty())
     {
-      memcached_return rc= memcached_mget(&memc, &real_keys[0], key_len, 
+      memcached_return rc= memcached_mget(&memc, &real_keys[0], &key_len[0], 
                                           static_cast<unsigned int>(real_keys.size()));
       return (rc == MEMCACHED_SUCCESS);
     }