Incomming code for additions in keys (see Changelog)

[awesomized/libmemcached] / libmemcached / memcached_constants.h

diff --git a/libmemcached/memcached_constants.h b/libmemcached/memcached_constants.h
index 237ff54d1a7c76ccc823d9f85154eb6ad56fe44b..5fea02089d51791791ded4bfa3c53e40c8ecb2dc 100644 (file)
--- a/libmemcached/memcached_constants.h
+++ b/libmemcached/memcached_constants.h
@@ -19,11 +19,13 @@ extern "C" {
 #define MEMCACHED_MAX_BUFFER 8196
 #define MEMCACHED_MAX_HOST_LENGTH 64
 #define MEMCACHED_MAX_HOST_SORT_LENGTH 86 /* Used for Ketama */
-#define MEMCACHED_WHEEL_SIZE 1024
-#define MEMCACHED_POINTS_PER_SERVER 100 
+#define MEMCACHED_POINTS_PER_SERVER 100
+#define MEMCACHED_POINTS_PER_SERVER_KETAMA 160
 #define MEMCACHED_CONTINUUM_SIZE MEMCACHED_POINTS_PER_SERVER*100 /* This would then set max hosts to 100 */ 
 #define MEMCACHED_STRIDE 4
-#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
+#define MEMCACHED_DEFAULT_TIMEOUT 1000
+#define MEMCACHED_CONTINUUM_ADDITION 10 /* How many extra slots we should build for in the continuum */
+#define MEMCACHED_PREFIX_KEY_MAX_SIZE 128
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -59,14 +61,14 @@ typedef enum {
   MEMCACHED_TIMEOUT,
   MEMCACHED_BUFFERED,
   MEMCACHED_BAD_KEY_PROVIDED,
-  MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */
+  MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
 } memcached_return;
 
 typedef enum {
   MEMCACHED_DISTRIBUTION_MODULA,
   MEMCACHED_DISTRIBUTION_CONSISTENT,
-  MEMCACHED_DISTRIBUTION_CONSISTENT_WHEEL,
   MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
+  MEMCACHED_DISTRIBUTION_RANDOM
 } memcached_server_distribution;
 
 typedef enum {
@@ -86,9 +88,19 @@ typedef enum {
   MEMCACHED_BEHAVIOR_VERIFY_KEY,
   MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
   MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
+  MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED,
+  MEMCACHED_BEHAVIOR_KETAMA_HASH,
+  MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
+  MEMCACHED_BEHAVIOR_SND_TIMEOUT,
+  MEMCACHED_BEHAVIOR_RCV_TIMEOUT,
+  MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT,
+  MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK,
+  MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK,
+  MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY
 } memcached_behavior;
 
 typedef enum {
+  MEMCACHED_CALLBACK_PREFIX_KEY,
   MEMCACHED_CALLBACK_USER_DATA,
   MEMCACHED_CALLBACK_CLEANUP_FUNCTION,
   MEMCACHED_CALLBACK_CLONE_FUNCTION,
@@ -96,7 +108,7 @@ typedef enum {
   MEMCACHED_CALLBACK_REALLOC_FUNCTION,
   MEMCACHED_CALLBACK_FREE_FUNCTION,
   MEMCACHED_CALLBACK_GET_FAILURE,
-  MEMCACHED_CALLBACK_DELETE_TRIGGER,
+  MEMCACHED_CALLBACK_DELETE_TRIGGER
 } memcached_callback;
 
 typedef enum {
@@ -107,22 +119,22 @@ typedef enum {
   MEMCACHED_HASH_FNV1A_64,
   MEMCACHED_HASH_FNV1_32,
   MEMCACHED_HASH_FNV1A_32,
-  MEMCACHED_HASH_KETAMA,
   MEMCACHED_HASH_HSIEH,
   MEMCACHED_HASH_MURMUR,
+  MEMCACHED_HASH_JENKINS
 } memcached_hash;
 
 typedef enum {
   MEMCACHED_CONNECTION_UNKNOWN,
   MEMCACHED_CONNECTION_TCP,
   MEMCACHED_CONNECTION_UDP,
-  MEMCACHED_CONNECTION_UNIX_SOCKET,
+  MEMCACHED_CONNECTION_UNIX_SOCKET
 } memcached_connection;
 
 typedef enum {
   MEMCACHED_NOT_ALLOCATED,
   MEMCACHED_ALLOCATED,
-  MEMCACHED_USED,
+  MEMCACHED_USED
 } memcached_allocated;