X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.hh;h=4e22b61cd22edc5e0c21eaa7a3e7f18d1df1f07b;hb=7b548d21a8eafec0b830ad1bd6429cecd4eaeba8;hp=42334e29353211516fbffea91cdee485c3e433ec;hpb=dbd274af6fc88a8f7a0456eb419a753dd842c88f;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.hh b/libmemcached/memcached.hh
index 42334e29..4e22b61c 100644
--- a/libmemcached/memcached.hh
+++ b/libmemcached/memcached.hh
@@ -1,14 +1,9 @@
-#include "libmemcached/memcached.h"
-#include <string.h>
-#include <stdio.h>
+#include <libmemcached/memcached.h>
 
 #include <string>
 
 class Memcached
 {
-  memcached_st memc;
-  memcached_result_st result;
-
 public:
 
   Memcached() 
@@ -32,7 +27,7 @@ public:
     memcached_free(&memc);
   }
 
-  std::string fetch(const std::string& key, size_t *key_length, size_t *value_length)
+  std::string fetch(std::string& key, size_t *key_length, size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
@@ -47,7 +42,7 @@ public:
     return ret_val;
   }
 
-  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;
@@ -63,8 +58,8 @@ public:
   }
 
   std::string get_by_key(const std::string& master_key, 
-                   const std::string& key, 
-                   size_t *value_length)
+                         const std::string& key, 
+                         size_t *value_length)
   {
     uint32_t flags;
     memcached_return rc;
@@ -80,29 +75,31 @@ public:
     return ret_val;
   }
 
-  memcached_return mget(char **keys, size_t *key_length, 
-                        unsigned int number_of_keys)
+  bool mget(char **keys, size_t *key_length, 
+            unsigned int number_of_keys)
   {
 
-    return memcached_mget(&memc, keys, key_length, number_of_keys);
+    memcached_return rc= memcached_mget(&memc, keys, key_length, number_of_keys);
+    return (rc == MEMCACHED_SUCCESS);
   }
 
-  bool set(const std::string& key, const char *value, size_t value_length)
+  bool set(const std::string& key, const std::string& value)
   {
-    memcached_return rc= memcached_set(&memc, key.c_str(), key.length(),
-                                       value, value_length,
+    memcached_return rc= memcached_set(&memc, 
+                                       key.c_str(), key.length(),
+                                       value.c_str(), value.length(),
                                        time_t(0), uint32_t(0));
     return (rc == MEMCACHED_SUCCESS);
   }
 
   bool set_by_key(const std::string& master_key, 
                   const std::string& key, 
-                  const char *value, size_t value_length)
+                  const std::string& value)
   {
     memcached_return rc= memcached_set_by_key(&memc, master_key.c_str(), 
                                               master_key.length(),
                                               key.c_str(), key.length(),
-                                              value, value_length,
+                                              value.c_str(), value.length(),
                                               time_t(0),
                                               uint32_t(0));
     return (rc == MEMCACHED_SUCCESS);
@@ -115,101 +112,125 @@ public:
     return (rc == MEMCACHED_SUCCESS);
   }
 
-  bool decrement(const char *key, unsigned int offset, uint64_t *value)
+  bool decrement(const std::string& key, unsigned int offset, uint64_t *value)
   {
-    memcached_return rc= memcached_decrement(&memc, key, strlen(key),
+    memcached_return rc= memcached_decrement(&memc, key.c_str(), 
+                                             key.length(),
                                              offset, value);
     return (rc == MEMCACHED_SUCCESS);
   }
 
 
-  bool add(const char *key, const char *value, size_t value_length)
+  bool add(const std::string& key, const std::string& value, size_t value_length)
   {
-    memcached_return rc= 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);
   }
 
-  bool 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, size_t value_length)
   {
-    memcached_return rc= memcached_add_by_key(&memc, master_key, strlen(master_key),
-                                              key, strlen(key),
-                                              value, value_length,
+    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);
   }
 
-  bool replace(const char *key, const char *value, 
+  bool replace(const std::string& key, const std::string& value, 
                size_t value_length)
   {
-    memcached_return rc= memcached_replace(&memc, key, strlen(key),
-                                           value, value_length,
+    memcached_return rc= memcached_replace(&memc, key.c_str(), key.length(),
+                                           value.c_str(), value_length,
                                            0, 0);
     return (rc == MEMCACHED_SUCCESS);
   }
 
-  bool 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, size_t value_length)
   {
-    memcached_return rc= 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);
   }
 
-  bool prepend(const char *key, const char *value, 
+  bool prepend(const std::string& key, const std::string& value, 
                size_t value_length)
   {
-    memcached_return rc= 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);
   }
 
-  bool 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, size_t value_length)
   {
-    memcached_return rc= memcached_prepend_by_key(&memc, master_key, strlen(master_key),
-                                                  key, strlen(key),
-                                                  value, value_length,
+    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);
   }
 
-  bool append(const char *key, const char *value, 
+  bool append(const std::string& key, const std::string& value, 
               size_t value_length)
   {
-    memcached_return rc= 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);
   }
 
-  bool 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, size_t value_length)
   {
     memcached_return rc= memcached_append_by_key(&memc,
-                                                 master_key, strlen(master_key),
-                                                 key, strlen(key),
-                                                 value, value_length, 0, 0);
+                                                 master_key.c_str(), 
+                                                 master_key.length(),
+                                                 key.c_str(), 
+                                                 key.length(),
+                                                 value.c_str(), 
+                                                 value_length, 0, 0);
     return (rc == MEMCACHED_SUCCESS);
   }
 
-  bool cas(const char *key, const char *value, 
+  bool cas(const std::string& key, const std::string& value, 
            size_t value_length, uint64_t cas_arg)
   {
-    memcached_return rc= 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);
   }
 
-  bool cas_by_key(const char *master_key, const char *key, 
-                  const char *value, size_t value_length, 
+  bool cas_by_key(const std::string& master_key, const std::string& key, 
+                  const std::string& value, size_t value_length, 
                   uint64_t cas_arg)
   {
     memcached_return rc= memcached_cas_by_key(&memc,
-                                              master_key, strlen(master_key),
-                                              key, strlen(key),
-                                              value, value_length,
+                                              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);
   }
@@ -221,10 +242,26 @@ public:
     return (rc == MEMCACHED_SUCCESS);
   }
 
-  bool delete_by_key(const char *master_key, const char *key)
+  bool delete_by_key(const std::string& master_key, 
+                     const std::string& key)
   {
-    memcached_return rc= memcached_delete_by_key(&memc, master_key, strlen(master_key),
-                                                 key, strlen(key), 0);
+    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);
   }
+
+  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;
 };