X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=440898e1e34ea29ab681b665f663748245465d2d;hb=3b22dd937e1f9216c526bcbf7fa3ba51cb37bbf6;hp=1baab961bbf7b9b348c3cb1cad386f899104ea5d;hpb=300beb84352ea83e7d061082eb18b363569001db;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 1baab961..440898e1 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -57,6 +57,7 @@
 #include <libmemcached/error.h>
 #include <libmemcached/stats.h>
 #include <libhashkit/hashkit.h>
+
 // Everything above this line must be in the order specified.
 #include <libmemcached/allocators.h>
 #include <libmemcached/analyze.h>
@@ -97,7 +98,7 @@ struct memcached_st {
     bool auto_eject_hosts:1;
     bool binary_protocol:1;
     bool buffer_requests:1;
-    bool hash_with_prefix_key:1;
+    bool hash_with_namespace:1;
     bool no_block:1; // Don't block
     bool no_reply:1;
     bool randomize_replica_read:1;
@@ -129,7 +130,6 @@ struct memcached_st {
   void *user_data;
   uint64_t query_id;
   uint32_t number_of_replicas;
-  hashkit_st distribution_hashkit;
   memcached_result_st result;
 
   struct {
@@ -142,13 +142,7 @@ struct memcached_st {
 
   struct memcached_virtual_bucket_t *virtual_bucket;
 
-  struct _allocators_st {
-    memcached_calloc_fn calloc;
-    memcached_free_fn free;
-    memcached_malloc_fn malloc;
-    memcached_realloc_fn realloc;
-    void *context;
-  } allocators;
+  struct memcached_allocator_t allocators;
 
   memcached_clone_fn on_clone;
   memcached_cleanup_fn on_cleanup;
@@ -157,7 +151,7 @@ struct memcached_st {
   memcached_callback_st *callbacks;
   struct memcached_sasl_st sasl;
   struct memcached_error_t *error_messages;
-  struct memcached_array_st *prefix_key;
+  struct memcached_array_st *_namespace;
   struct {
     uint32_t initial_pool_size;
     uint32_t max_pool_size;
@@ -210,6 +204,9 @@ memcached_server_instance_st memcached_server_instance_by_position(const memcach
 LIBMEMCACHED_API
 uint32_t memcached_server_count(const memcached_st *);
 
+LIBMEMCACHED_API
+uint64_t memcached_query_id(const memcached_st *);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif