Merge Thomason's cork patch.

[awesomized/libmemcached] / libmemcached / constants.h

diff --git a/libmemcached/constants.h b/libmemcached/constants.h
index cbdbf4b58467c82b89c6c2ffd6b21688b35bbf48..11b2f677e2702c2e984d7778f38f676c308ba094 100644 (file)
--- a/libmemcached/constants.h
+++ b/libmemcached/constants.h
@@ -1,5 +1,5 @@
 /* LibMemcached
- * Copyright (C) 2006-2009 Brian Aker 
+ * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -26,6 +26,8 @@
 #define MEMCACHED_CONTINUUM_ADDITION 10 /* How many extra slots we should build for in the continuum */
 #define MEMCACHED_PREFIX_KEY_MAX_SIZE 128
 #define MEMCACHED_EXPIRATION_NOT_ADD 0xffffffffU
+#define MEMCACHED_VERSION_STRING_LENGTH 24
+
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -76,7 +78,8 @@ typedef enum {
   MEMCACHED_DISTRIBUTION_CONSISTENT,
   MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
   MEMCACHED_DISTRIBUTION_RANDOM,
-  MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY
+  MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY,
+  MEMCACHED_DISTRIBUTION_CONSISTENT_MAX
 } memcached_server_distribution_t;
 
 typedef enum {
@@ -110,13 +113,11 @@ typedef enum {
   MEMCACHED_BEHAVIOR_USE_UDP,
   MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS,
   MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
-  MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE,
-  MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ
+  MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ,
+  MEMCACHED_BEHAVIOR_CORK,
+  MEMCACHED_BEHAVIOR_MAX
 } memcached_behavior_t;
 
-#define MEMCACHED_KETAMA_COMPAT_LIBMEMCACHED 0
-#define MEMCACHED_KETAMA_COMPAT_SPY 1
-
 typedef enum {
   MEMCACHED_CALLBACK_PREFIX_KEY = 0,
   MEMCACHED_CALLBACK_USER_DATA = 1,
@@ -128,7 +129,8 @@ typedef enum {
   MEMCACHED_CALLBACK_FREE_FUNCTION = 6,
 #endif
   MEMCACHED_CALLBACK_GET_FAILURE = 7,
-  MEMCACHED_CALLBACK_DELETE_TRIGGER = 8
+  MEMCACHED_CALLBACK_DELETE_TRIGGER = 8,
+  MEMCACHED_CALLBACK_MAX
 } memcached_callback_t;
 
 typedef enum {
@@ -141,14 +143,16 @@ typedef enum {
   MEMCACHED_HASH_FNV1A_32,
   MEMCACHED_HASH_HSIEH,
   MEMCACHED_HASH_MURMUR,
-  MEMCACHED_HASH_JENKINS
+  MEMCACHED_HASH_JENKINS,
+  MEMCACHED_HASH_MAX
 } memcached_hash_t;
 
 typedef enum {
   MEMCACHED_CONNECTION_UNKNOWN,
   MEMCACHED_CONNECTION_TCP,
   MEMCACHED_CONNECTION_UDP,
-  MEMCACHED_CONNECTION_UNIX_SOCKET
+  MEMCACHED_CONNECTION_UNIX_SOCKET,
+  MEMCACHED_CONNECTION_MAX
 } memcached_connection_t;
 
 #endif /* __MEMCACHED_CONSTANTS_H__ */