Merge up of dev trees.

[m6w6/libmemcached] / libmemcached / memcached.cc

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index a1551cd2632566eb50f7825069855ca292ffd6d7..e81f19ee6fabb94687202a1be7d201d8fb34b0f1 100644 (file)
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -36,6 +36,8 @@
  */
 
 #include <libmemcached/common.h>
+
+#include <libmemcached/options.hpp>
 #include <libmemcached/virtual_bucket.h>
 
 #if 0
@@ -49,7 +51,7 @@ static const memcached_st global_copy= {
     .auto_eject_hosts= false,
     .binary_protocol= false,
     .buffer_requests= false,
-    .hash_with_prefix_key= false,
+    .hash_with_namespace= false,
     .no_block= false,
     .no_reply= false,
     .randomize_replica_read= false,
@@ -72,7 +74,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->flags.auto_eject_hosts= false;
   self->flags.binary_protocol= false;
   self->flags.buffer_requests= false;
-  self->flags.hash_with_prefix_key= false;
+  self->flags.hash_with_namespace= false;
   self->flags.no_block= false;
   self->flags.no_reply= false;
   self->flags.randomize_replica_read= false;
@@ -88,7 +90,11 @@ static inline bool _memcached_init(memcached_st *self)
   self->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
   if (not hashkit_create(&self->hashkit))
+  {
     return false;
+  }
+
+  self->server_info.version= 0;
 
   self->ketama.continuum= NULL;
   self->ketama.continuum_count= 0;
@@ -102,7 +108,7 @@ static inline bool _memcached_init(memcached_st *self)
 
   self->snd_timeout= 0;
   self->rcv_timeout= 0;
-  self->server_failure_limit= 0;
+  self->server_failure_limit= MEMCACHED_SERVER_FAILURE_LIMIT;
   self->query_id= 1; // 0 is considered invalid
 
   /* TODO, Document why we picked these defaults */
@@ -114,7 +120,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->io_key_prefetch= 0;
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
-  self->retry_timeout= 0;
+  self->retry_timeout= MEMCACHED_SERVER_FAILURE_RETRY_TIMEOUT;
 
   self->send_size= -1;
   self->recv_size= -1;
@@ -133,7 +139,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->sasl.is_allocated= false;
 
   self->error_messages= NULL;
-  self->prefix_key= NULL;
+  self->_namespace= NULL;
   self->configure.initial_pool_size= 1;
   self->configure.max_pool_size= 1;
   self->configure.version= -1;
@@ -151,25 +157,23 @@ static void _free(memcached_st *ptr, bool release_st)
 
   memcached_virtual_bucket_free(ptr);
 
-  if (ptr->last_disconnected_server)
-    memcached_server_free(ptr->last_disconnected_server);
+  memcached_server_free(ptr->last_disconnected_server);
 
   if (ptr->on_cleanup)
+  {
     ptr->on_cleanup(ptr);
+  }
 
-  if (ptr->ketama.continuum)
-    libmemcached_free(ptr, ptr->ketama.continuum);
+  libmemcached_free(ptr, ptr->ketama.continuum);
 
-  memcached_array_free(ptr->prefix_key);
-  ptr->prefix_key= NULL;
+  memcached_array_free(ptr->_namespace);
+  ptr->_namespace= NULL;
 
-  memcached_error_free(ptr);
+  memcached_error_free(*ptr);
 
-  if (ptr->sasl.callbacks)
+  if (LIBMEMCACHED_WITH_SASL_SUPPORT and ptr->sasl.callbacks)
   {
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
     memcached_destroy_sasl_auth_data(ptr);
-#endif
   }
 
   if (release_st)
@@ -190,7 +194,7 @@ memcached_st *memcached_create(memcached_st *ptr)
   {
     ptr= (memcached_st *)malloc(sizeof(memcached_st));
 
-    if (! ptr)
+    if (not ptr)
     {
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
     }
@@ -207,13 +211,13 @@ memcached_st *memcached_create(memcached_st *ptr)
   memcached_set_processing_input(ptr, false);
 #endif
 
-  if (! _memcached_init(ptr))
+  if (_memcached_init(ptr) == false)
   {
     memcached_free(ptr);
     return NULL;
   }
 
-  if (! memcached_result_create(ptr, &ptr->result))
+  if (memcached_result_create(ptr, &ptr->result) == NULL)
   {
     memcached_free(ptr);
     return NULL;
@@ -226,12 +230,6 @@ memcached_st *memcached_create(memcached_st *ptr)
 
 memcached_st *memcached(const char *string, size_t length)
 {
-  if ((not length and string) or (length and not string))
-  {
-    errno= EINVAL;
-    return NULL;
-  }
-
   memcached_st *self= memcached_create(NULL);
   if (not self)
   {
@@ -240,25 +238,24 @@ memcached_st *memcached(const char *string, size_t length)
   }
 
   if (not length)
+  {
     return self;
+  }
 
-  memcached_return_t rc;
-  rc= memcached_parse_configuration(self, string, length);
+  memcached_return_t rc= memcached_parse_configuration(self, string, length);
 
-  if (rc == MEMCACHED_SUCCESS && memcached_parse_filename(self))
+  if (memcached_success(rc) and memcached_parse_filename(self))
   {
-    rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
+    rc= memcached_parse_configure_file(*self, memcached_parse_filename(self), memcached_parse_filename_length(self));
   }
     
-  if (rc != MEMCACHED_SUCCESS)
+  if (memcached_failed(rc))
   {
     memcached_free(self);
     errno= EINVAL;
     return NULL;
   }
 
-  errno= 0;
-
   return self;
 }
 
@@ -266,7 +263,9 @@ memcached_return_t memcached_reset(memcached_st *ptr)
 {
   WATCHPOINT_ASSERT(ptr);
   if (not ptr)
+  {
     return MEMCACHED_INVALID_ARGUMENTS;
+  }
 
   bool stored_is_allocated= memcached_is_allocated(ptr);
   uint64_t query_id= ptr->query_id;
@@ -277,47 +276,40 @@ memcached_return_t memcached_reset(memcached_st *ptr)
 
   if (ptr->configure.filename)
   {
-    return memcached_parse_configure_file(ptr, memcached_param_array(ptr->configure.filename));
+    return memcached_parse_configure_file(*ptr, memcached_param_array(ptr->configure.filename));
   }
 
   return MEMCACHED_SUCCESS;
 }
 
-void memcached_servers_reset(memcached_st *ptr)
+void memcached_servers_reset(memcached_st *self)
 {
-  if (! ptr)
-    return;
-
-  memcached_server_list_free(memcached_server_list(ptr));
-
-  memcached_server_list_set(ptr, NULL);
-  ptr->number_of_hosts= 0;
-  if (ptr->last_disconnected_server)
+  if (self)
   {
-    memcached_server_free(ptr->last_disconnected_server);
+    memcached_server_list_free(memcached_server_list(self));
+
+    memcached_server_list_set(self, NULL);
+    self->number_of_hosts= 0;
+    memcached_server_free(self->last_disconnected_server);
+    self->last_disconnected_server= NULL;
   }
-  ptr->last_disconnected_server= NULL;
-  ptr->server_failure_limit= 0;
 }
 
-void memcached_reset_last_disconnected_server(memcached_st *ptr)
+void memcached_reset_last_disconnected_server(memcached_st *self)
 {
-  if (! ptr)
-    return;
-
-  if (ptr->last_disconnected_server)
+  if (self)
   {
-    memcached_server_free(ptr->last_disconnected_server);
-    ptr->last_disconnected_server= NULL;
+    memcached_server_free(self->last_disconnected_server);
+    self->last_disconnected_server= NULL;
   }
 }
 
 void memcached_free(memcached_st *ptr)
 {
-  if (! ptr)
-    return;
-
-  _free(ptr, true);
+  if (ptr)
+  {
+    _free(ptr, true);
+  }
 }
 
 /*
@@ -328,9 +320,8 @@ void memcached_free(memcached_st *ptr)
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
 {
   memcached_return_t rc= MEMCACHED_SUCCESS;
-  memcached_st *new_clone;
 
-  if (source == NULL)
+  if (not source)
     return memcached_create(clone);
 
   if (clone && memcached_is_allocated(clone))
@@ -338,9 +329,9 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
     return NULL;
   }
 
-  new_clone= memcached_create(clone);
+  memcached_st *new_clone= memcached_create(clone);
 
-  if (new_clone == NULL)
+  if (not new_clone)
     return NULL;
 
   new_clone->flags= source->flags;
@@ -377,9 +368,11 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->tcp_keepidle= source->tcp_keepidle;
 
   if (memcached_server_count(source))
+  {
     rc= memcached_push(new_clone, source);
+  }
 
-  if (rc != MEMCACHED_SUCCESS)
+  if (memcached_failed(rc))
   {
     memcached_free(new_clone);
 
@@ -387,22 +380,19 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   }
 
 
-  new_clone->prefix_key= memcached_array_clone(new_clone, source->prefix_key);
+  new_clone->_namespace= memcached_array_clone(new_clone, source->_namespace);
+  new_clone->configure.filename= memcached_array_clone(new_clone, source->_namespace);
 
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-  if (source->sasl.callbacks)
+  if (LIBMEMCACHED_WITH_SASL_SUPPORT and source->sasl.callbacks)
   {
-    if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
+    if (memcached_failed(memcached_clone_sasl(new_clone, source)))
     {
       memcached_free(new_clone);
       return NULL;
     }
   }
-#endif
 
-  rc= run_distribution(new_clone);
-
-  if (rc != MEMCACHED_SUCCESS)
+  if (memcached_failed(run_distribution(new_clone)))
   {
     memcached_free(new_clone);
 
@@ -410,7 +400,9 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   }
 
   if (source->on_clone)
+  {
     source->on_clone(new_clone, source);
+  }
 
   return new_clone;
 }