X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=3a1def4845086c06f57fcc57485762aebbf66fa5;hb=fe8ad508b0fec5ca6860b3fa5d10727250e3b1d4;hp=ec058d3d5d72dae7c439b3d780d2a2ad4b9d41f5;hpb=8fce86636639afaeac4ca0e869e8bcd833324a62;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index ec058d3d..3a1def48 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -30,17 +30,13 @@ extern "C" { /* These are Private and should not be used by applications */ #define MEMCACHED_VERSION_STRING_LENGTH 12 -/* Public defines */ -#define MEMCACHED_DEFAULT_PORT 11211 -#define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */ -#define MEMCACHED_MAX_BUFFER 8196 -#define MEMCACHED_MAX_HOST_LENGTH 64 -#define MEMCACHED_WHEEL_SIZE 1024 -#define MEMCACHED_STRIDE 4 -#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX - /* string value */ -#define LIBMEMCACHED_VERSION_STRING "0.17" +struct memcached_continuum_item_st { + uint32_t index; + uint32_t value; +}; + +#define LIBMEMCACHED_VERSION_STRING "0.20" struct memcached_stat_st { uint32_t pid; @@ -85,18 +81,24 @@ struct memcached_st { memcached_hash hash; memcached_server_distribution distribution; void *user_data; - unsigned int wheel[MEMCACHED_WHEEL_SIZE]; + unsigned int *wheel; + uint32_t wheel_count; + uint32_t continuum_count; + memcached_continuum_item_st *continuum; memcached_clone_func on_clone; memcached_cleanup_func on_cleanup; memcached_free_function call_free; memcached_malloc_function call_malloc; memcached_realloc_function call_realloc; + memcached_trigger_key get_key_failure; + memcached_trigger_delete_key delete_trigger; #ifdef NOT_USED /* Future Use */ uint8_t replicas; memcached_return warning; #endif }; + /* Public API */ const char * memcached_lib_version(void); @@ -125,36 +127,6 @@ char *memcached_strerror(memcached_st *ptr, memcached_return rc); memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data); uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag); -/* All of the functions for adding data to the server */ -memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); -memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); -memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); -memcached_return memcached_append(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); -memcached_return memcached_prepend(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); -memcached_return memcached_cas(memcached_st *ptr, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags, - uint64_t cas); - /* Get functions */ char *memcached_get(memcached_st *ptr, char *key, size_t key_length, size_t *value_length, @@ -205,58 +177,15 @@ memcached_return memcached_mget_by_key(memcached_st *ptr, char **keys, size_t *key_length, unsigned int number_of_keys); -memcached_return memcached_set_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -memcached_return memcached_add_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -memcached_return memcached_replace_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -memcached_return memcached_prepend_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -memcached_return memcached_append_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags); - -memcached_return memcached_cas_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, - char *value, size_t value_length, - time_t expiration, - uint32_t flags, - uint64_t cas); memcached_return memcached_delete_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, time_t expiration); memcached_return memcached_fetch_execute(memcached_st *ptr, - unsigned int (*callback[])(memcached_st *ptr, memcached_result_st *result, void *context), + memcached_execute_function *callback, void *context, - unsigned int number_of_callbacks - ); + unsigned int number_of_callbacks); memcached_return memcached_callback_set(memcached_st *ptr, memcached_callback flag, @@ -275,4 +204,6 @@ memcached_return memcached_server_cursor(memcached_st *ptr, } #endif +#include + #endif /* __MEMCACHED_H__ */