projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix a bug in update_continuum
[m6w6/libmemcached]
/
libmemcached
/
memcached_constants.h
diff --git
a/libmemcached/memcached_constants.h
b/libmemcached/memcached_constants.h
index cb7b20959490c3ffbd463d41ca1e03308dfe29e1..ab64042142865a5034d8f5d51cb8d035070750be 100644
(file)
--- a/
libmemcached/memcached_constants.h
+++ b/
libmemcached/memcached_constants.h
@@
-24,6
+24,7
@@
extern "C" {
#define MEMCACHED_STRIDE 4
#define MEMCACHED_DEFAULT_TIMEOUT 1000
#define MEMCACHED_CONTINUUM_ADDITION 10 /* How many extra slots we should build for in the continuum */
#define MEMCACHED_STRIDE 4
#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 12
typedef enum {
MEMCACHED_SUCCESS,
typedef enum {
MEMCACHED_SUCCESS,
@@
-59,14
+60,13
@@
typedef enum {
MEMCACHED_TIMEOUT,
MEMCACHED_BUFFERED,
MEMCACHED_BAD_KEY_PROVIDED,
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_return;
typedef enum {
MEMCACHED_DISTRIBUTION_MODULA,
MEMCACHED_DISTRIBUTION_CONSISTENT,
- MEMCACHED_DISTRIBUTION_CONSISTENT_WHEEL,
- MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
+ MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA
} memcached_server_distribution;
typedef enum {
} memcached_server_distribution;
typedef enum {
@@
-86,9
+86,16
@@
typedef enum {
MEMCACHED_BEHAVIOR_VERIFY_KEY,
MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
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;
typedef enum {
} memcached_behavior;
typedef enum {
+ MEMCACHED_CALLBACK_PREFIX_KEY,
MEMCACHED_CALLBACK_USER_DATA,
MEMCACHED_CALLBACK_CLEANUP_FUNCTION,
MEMCACHED_CALLBACK_CLONE_FUNCTION,
MEMCACHED_CALLBACK_USER_DATA,
MEMCACHED_CALLBACK_CLEANUP_FUNCTION,
MEMCACHED_CALLBACK_CLONE_FUNCTION,
@@
-96,7
+103,7
@@
typedef enum {
MEMCACHED_CALLBACK_REALLOC_FUNCTION,
MEMCACHED_CALLBACK_FREE_FUNCTION,
MEMCACHED_CALLBACK_GET_FAILURE,
MEMCACHED_CALLBACK_REALLOC_FUNCTION,
MEMCACHED_CALLBACK_FREE_FUNCTION,
MEMCACHED_CALLBACK_GET_FAILURE,
- MEMCACHED_CALLBACK_DELETE_TRIGGER
,
+ MEMCACHED_CALLBACK_DELETE_TRIGGER
} memcached_callback;
typedef enum {
} memcached_callback;
typedef enum {
@@
-107,22
+114,21
@@
typedef enum {
MEMCACHED_HASH_FNV1A_64,
MEMCACHED_HASH_FNV1_32,
MEMCACHED_HASH_FNV1A_32,
MEMCACHED_HASH_FNV1A_64,
MEMCACHED_HASH_FNV1_32,
MEMCACHED_HASH_FNV1A_32,
- MEMCACHED_HASH_KETAMA,
MEMCACHED_HASH_HSIEH,
MEMCACHED_HASH_HSIEH,
- MEMCACHED_HASH_MURMUR
,
+ MEMCACHED_HASH_MURMUR
} memcached_hash;
typedef enum {
MEMCACHED_CONNECTION_UNKNOWN,
MEMCACHED_CONNECTION_TCP,
MEMCACHED_CONNECTION_UDP,
} 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_connection;
typedef enum {
MEMCACHED_NOT_ALLOCATED,
MEMCACHED_ALLOCATED,
- MEMCACHED_USED
,
+ MEMCACHED_USED
} memcached_allocated;
} memcached_allocated;