From f7936c06de41de0df9d561e4576d217595b0c5a4 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Mon, 11 Apr 2011 16:20:29 -0700 Subject: [PATCH] Merge in updates to the documentation. --- docs/libmemcached.rst | 7 ++- docs/man/libmemcached.3 | 7 ++- docs/man/memcached_add.3 | 14 +++--- docs/man/memcached_add_by_key.3 | 14 +++--- docs/man/memcached_append.3 | 14 +++--- docs/man/memcached_append_by_key.3 | 14 +++--- docs/man/memcached_auto.3 | 8 ++-- docs/man/memcached_cas.3 | 14 +++--- docs/man/memcached_cas_by_key.3 | 14 +++--- docs/man/memcached_decrement.3 | 8 ++-- docs/man/memcached_decrement_with_initial.3 | 8 ++-- docs/man/memcached_delete.3 | 2 +- docs/man/memcached_delete_by_key.3 | 2 +- docs/man/memcached_fetch.3 | 6 +-- docs/man/memcached_fetch_execute.3 | 6 +-- docs/man/memcached_fetch_result.3 | 6 +-- docs/man/memcached_get.3 | 6 +-- docs/man/memcached_get_by_key.3 | 6 +-- docs/man/memcached_increment.3 | 8 ++-- docs/man/memcached_increment_with_initial.3 | 8 ++-- docs/man/memcached_mget.3 | 6 +-- docs/man/memcached_mget_by_key.3 | 6 +-- docs/man/memcached_mget_execute.3 | 6 +-- docs/man/memcached_mget_execute_by_key.3 | 6 +-- docs/man/memcached_prepend.3 | 14 +++--- docs/man/memcached_prepend_by_key.3 | 14 +++--- docs/man/memcached_replace.3 | 14 +++--- docs/man/memcached_replace_by_key.3 | 14 +++--- docs/man/memcached_set.3 | 14 +++--- docs/man/memcached_set_by_key.3 | 14 +++--- docs/memcached_auto.rst | 8 ++-- docs/memcached_delete.rst | 2 +- docs/memcached_get.rst | 6 +-- docs/memcached_set.rst | 14 +++--- libmemcached/auto.c | 32 ++++++------- libmemcached/auto.h | 12 ++--- libmemcached/delete.c | 4 +- libmemcached/delete.h | 2 +- libmemcached/get.c | 52 ++++++++++----------- libmemcached/get.h | 10 ++-- libmemcached/storage.c | 30 ++++++------ libmemcached/storage.h | 12 ++--- 42 files changed, 235 insertions(+), 229 deletions(-) diff --git a/docs/libmemcached.rst b/docs/libmemcached.rst index c60cf99c..ddf3108e 100644 --- a/docs/libmemcached.rst +++ b/docs/libmemcached.rst @@ -39,8 +39,11 @@ recommended that you operate directly against the structure. Nearly all functions return a \ ``memcached_return_t``\ value. This value can be translated to a printable string with memcached_strerror(3). -Partitioning based on keys is testsed in the library. Using the key partioning -functions it is possible to group sets of object onto servers. +Objects are stored on servers by hashing keys. The hash value maps the key to a particular server. All clients understand how this hashing works, so it is possibly to reliably both push data to a server and retrieve data from a server. + +Group keys can be optionally used to group sets of objects with servers. + +Namespaces are supported, and can be used to partition caches so that multiple applications can use the same memcached servers. \ ``memcached_st``\ structures are thread-safe, but each thread must contain its own structure (that is, if you want to share these among diff --git a/docs/man/libmemcached.3 b/docs/man/libmemcached.3 index 52f346f7..96f6f4e2 100644 --- a/docs/man/libmemcached.3 +++ b/docs/man/libmemcached.3 @@ -60,8 +60,11 @@ recommended that you operate directly against the structure. Nearly all functions return a \fBmemcached_return_t\fP value. This value can be translated to a printable string with memcached_strerror(3). .sp -Partitioning based on keys is testsed in the library. Using the key partioning -functions it is possible to group sets of object onto servers. +Objects are stored on servers by hashing keys. The hash value maps the key to a particular server. All clients understand how this hashing works, so it is possibly to reliably both push data to a server and retrieve data from a server. +.sp +Group keys can be optionally used to group sets of objects with servers. +.sp +Namespaces are supported, and can be used to partition caches so that multiple applications can use the same memcached servers. .sp \fBmemcached_st\fP structures are thread\-safe, but each thread must contain its own structure (that is, if you want to share these among diff --git a/docs/man/memcached_add.3 b/docs/man/memcached_add.3 index 3416bd37..3bb6739c 100644 --- a/docs/man/memcached_add.3 +++ b/docs/man/memcached_add.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_add_by_key.3 b/docs/man/memcached_add_by_key.3 index b045999f..67fa2342 100644 --- a/docs/man/memcached_add_by_key.3 +++ b/docs/man/memcached_add_by_key.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_append.3 b/docs/man/memcached_append.3 index 2d534044..97027004 100644 --- a/docs/man/memcached_append.3 +++ b/docs/man/memcached_append.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_append_by_key.3 b/docs/man/memcached_append_by_key.3 index 3652dbb0..42bf275d 100644 --- a/docs/man/memcached_append_by_key.3 +++ b/docs/man/memcached_append_by_key.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_auto.3 b/docs/man/memcached_auto.3 index d1ebf8aa..f63a1ae2 100644 --- a/docs/man/memcached_auto.3 +++ b/docs/man/memcached_auto.3 @@ -51,19 +51,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_cas.3 b/docs/man/memcached_cas.3 index a91d4e59..953aac18 100644 --- a/docs/man/memcached_cas.3 +++ b/docs/man/memcached_cas.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_cas_by_key.3 b/docs/man/memcached_cas_by_key.3 index 866c7d8a..49d603bb 100644 --- a/docs/man/memcached_cas_by_key.3 +++ b/docs/man/memcached_cas_by_key.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_decrement.3 b/docs/man/memcached_decrement.3 index 5d5b7c07..bf5b9797 100644 --- a/docs/man/memcached_decrement.3 +++ b/docs/man/memcached_decrement.3 @@ -51,19 +51,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_decrement_with_initial.3 b/docs/man/memcached_decrement_with_initial.3 index 8475f737..8fad70a9 100644 --- a/docs/man/memcached_decrement_with_initial.3 +++ b/docs/man/memcached_decrement_with_initial.3 @@ -51,19 +51,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_delete.3 b/docs/man/memcached_delete.3 index 13ab4303..b846b86e 100644 --- a/docs/man/memcached_delete.3 +++ b/docs/man/memcached_delete.3 @@ -39,7 +39,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_delete_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, time_t expiration); +.B memcached_return_t memcached_delete_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, time_t expiration); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_delete_by_key.3 b/docs/man/memcached_delete_by_key.3 index 321e4d21..7d476979 100644 --- a/docs/man/memcached_delete_by_key.3 +++ b/docs/man/memcached_delete_by_key.3 @@ -39,7 +39,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_delete_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, time_t expiration); +.B memcached_return_t memcached_delete_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, time_t expiration); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_fetch.3 b/docs/man/memcached_fetch.3 index 6c003588..b1b34c3d 100644 --- a/docs/man/memcached_fetch.3 +++ b/docs/man/memcached_fetch.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_fetch_execute.3 b/docs/man/memcached_fetch_execute.3 index 3d34ee89..2c716fec 100644 --- a/docs/man/memcached_fetch_execute.3 +++ b/docs/man/memcached_fetch_execute.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_fetch_result.3 b/docs/man/memcached_fetch_result.3 index 5ae03ec5..f5afaccb 100644 --- a/docs/man/memcached_fetch_result.3 +++ b/docs/man/memcached_fetch_result.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_get.3 b/docs/man/memcached_get.3 index 3b9892e6..519d56f2 100644 --- a/docs/man/memcached_get.3 +++ b/docs/man/memcached_get.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_get_by_key.3 b/docs/man/memcached_get_by_key.3 index 25757c81..39bd8709 100644 --- a/docs/man/memcached_get_by_key.3 +++ b/docs/man/memcached_get_by_key.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_increment.3 b/docs/man/memcached_increment.3 index c3b7d0ab..7e488991 100644 --- a/docs/man/memcached_increment.3 +++ b/docs/man/memcached_increment.3 @@ -51,19 +51,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_increment_with_initial.3 b/docs/man/memcached_increment_with_initial.3 index d542ded5..45a306dd 100644 --- a/docs/man/memcached_increment_with_initial.3 +++ b/docs/man/memcached_increment_with_initial.3 @@ -51,19 +51,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.B memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.B memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_mget.3 b/docs/man/memcached_mget.3 index 05f023c6..ea841db3 100644 --- a/docs/man/memcached_mget.3 +++ b/docs/man/memcached_mget.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_mget_by_key.3 b/docs/man/memcached_mget_by_key.3 index 15040a7a..3f4616e5 100644 --- a/docs/man/memcached_mget_by_key.3 +++ b/docs/man/memcached_mget_by_key.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_mget_execute.3 b/docs/man/memcached_mget_execute.3 index 4097c289..9eb34f5a 100644 --- a/docs/man/memcached_mget_execute.3 +++ b/docs/man/memcached_mget_execute.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_mget_execute_by_key.3 b/docs/man/memcached_mget_execute_by_key.3 index 1bf68806..0aca15f5 100644 --- a/docs/man/memcached_mget_execute_by_key.3 +++ b/docs/man/memcached_mget_execute_by_key.3 @@ -47,11 +47,11 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.B char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.B memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .UNINDENT .INDENT 0.0 .TP @@ -67,7 +67,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.B memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); .UNINDENT .sp Compile and link with \-lmemcached diff --git a/docs/man/memcached_prepend.3 b/docs/man/memcached_prepend.3 index ae318832..ffe7f082 100644 --- a/docs/man/memcached_prepend.3 +++ b/docs/man/memcached_prepend.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_prepend_by_key.3 b/docs/man/memcached_prepend_by_key.3 index d3dd972c..c56596d3 100644 --- a/docs/man/memcached_prepend_by_key.3 +++ b/docs/man/memcached_prepend_by_key.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_replace.3 b/docs/man/memcached_replace.3 index 0c31598b..698813b6 100644 --- a/docs/man/memcached_replace.3 +++ b/docs/man/memcached_replace.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_replace_by_key.3 b/docs/man/memcached_replace_by_key.3 index d89ff8aa..c28e9598 100644 --- a/docs/man/memcached_replace_by_key.3 +++ b/docs/man/memcached_replace_by_key.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_set.3 b/docs/man/memcached_set.3 index 76350727..63c4ea4c 100644 --- a/docs/man/memcached_set.3 +++ b/docs/man/memcached_set.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/man/memcached_set_by_key.3 b/docs/man/memcached_set_by_key.3 index f9c062d2..e81ea0f1 100644 --- a/docs/man/memcached_set_by_key.3 +++ b/docs/man/memcached_set_by_key.3 @@ -61,27 +61,27 @@ Store value on server .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.B memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); .UNINDENT .INDENT 0.0 .TP -.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.B memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); .UNINDENT .sp Compile and link with \-lmemcached @@ -121,7 +121,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. .sp If you are looking for performance, memcached_set() with non\-blocking IO is diff --git a/docs/memcached_auto.rst b/docs/memcached_auto.rst index 39b4247a..fab217f9 100644 --- a/docs/memcached_auto.rst +++ b/docs/memcached_auto.rst @@ -20,13 +20,13 @@ SYNOPSIS .. c:function:: memcached_return_t memcached_decrement_with_initial (memcached_st *ptr, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); -.. c:function:: memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.. c:function:: memcached_return_t memcached_increment_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); -.. c:function:: memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); +.. c:function:: memcached_return_t memcached_decrement_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, unsigned int offset, uint64_t *value); -.. c:function:: memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.. c:function:: memcached_return_t memcached_increment_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); -.. c:function:: memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); +.. c:function:: memcached_return_t memcached_decrement_with_initial_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, time_t expiration, uint64_t *value); Compile and link with -lmemcached diff --git a/docs/memcached_delete.rst b/docs/memcached_delete.rst index 85ecef7e..6082094a 100644 --- a/docs/memcached_delete.rst +++ b/docs/memcached_delete.rst @@ -11,7 +11,7 @@ SYNOPSIS .. c:function:: memcached_return_t memcached_delete (memcached_st *ptr, const char *key, size_t key_length, time_t expiration); -.. c:function:: memcached_return_t memcached_delete_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, time_t expiration); +.. c:function:: memcached_return_t memcached_delete_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, time_t expiration); Compile and link with -lmemcached diff --git a/docs/memcached_get.rst b/docs/memcached_get.rst index ea0c6355..c857b329 100644 --- a/docs/memcached_get.rst +++ b/docs/memcached_get.rst @@ -16,9 +16,9 @@ SYNOPSIS .. c:function:: memcached_return_t memcached_mget (memcached_st *ptr, const char * const *keys, const size_t *key_length, size_t number_of_keys); -.. c:function:: char * memcached_get_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); +.. c:function:: char * memcached_get_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); -.. c:function:: memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); +.. c:function:: memcached_return_t memcached_mget_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys); .. c:function:: char * memcached_fetch (memcached_st *ptr, char *key, size_t *key_length, size_t *value_length, uint32_t *flags, memcached_return_t *error); @@ -26,7 +26,7 @@ SYNOPSIS .. c:function:: memcached_return_t memcached_mget_execute (memcached_st *ptr, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); -.. c:function:: memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *master_key, size_t master_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); +.. c:function:: memcached_return_t memcached_mget_execute_by_key (memcached_st *ptr, const char *group_key, size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, memcached_execute_fn *callback, void *context, uint32_t number_of_callbacks); Compile and link with -lmemcached diff --git a/docs/memcached_set.rst b/docs/memcached_set.rst index 2d026fa7..ec6c60e2 100644 --- a/docs/memcached_set.rst +++ b/docs/memcached_set.rst @@ -26,17 +26,17 @@ SYNOPSIS .. c:function:: memcached_return_t memcached_cas(memcached_st *ptr, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); -.. c:function:: memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.. c:function:: memcached_return_t memcached_set_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); -.. c:function:: memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.. c:function:: memcached_return_t memcached_add_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); -.. c:function:: memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.. c:function:: memcached_return_t memcached_replace_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); -.. c:function:: memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.. c:function:: memcached_return_t memcached_prepend_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); -.. c:function:: memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); +.. c:function:: memcached_return_t memcached_append_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags); -.. c:function:: memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); +.. c:function:: memcached_return_t memcached_cas_by_key(memcached_st *ptr, const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags, uint64_t cas); Compile and link with -lmemcached @@ -80,7 +80,7 @@ information on how to do this. memcached_set_by_key(), memcached_add_by_key(), memcached_replace_by_key(), memcached_prepend_by_key(), memcached_append_by_key_by_key(), memcached_cas_by_key() methods all behave in a similar method as the non key -methods. The difference is that they use their master_key parameter to map +methods. The difference is that they use their group_key parameter to map objects to particular servers. If you are looking for performance, memcached_set() with non-blocking IO is diff --git a/libmemcached/auto.c b/libmemcached/auto.c index 7bd0cc12..325ddb6b 100644 --- a/libmemcached/auto.c +++ b/libmemcached/auto.c @@ -13,7 +13,7 @@ static memcached_return_t text_incr_decr(memcached_st *ptr, const char *verb, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) @@ -30,7 +30,7 @@ static memcached_return_t text_incr_decr(memcached_st *ptr, if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) return MEMCACHED_BAD_KEY_PROVIDED; - server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); + server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); instance= memcached_server_instance_fetch(ptr, server_key); int send_length; @@ -80,7 +80,7 @@ static memcached_return_t text_incr_decr(memcached_st *ptr, } static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t initial, uint32_t expiration, @@ -93,7 +93,7 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd, if (memcached_server_count(ptr) == 0) return memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL); - server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); + server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); instance= memcached_server_instance_fetch(ptr, server_key); if (no_reply) @@ -159,7 +159,7 @@ memcached_return_t memcached_decrement(memcached_st *ptr, } memcached_return_t memcached_increment_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) @@ -176,13 +176,13 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr, if (ptr->flags.binary_protocol) { rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD, value); } else { - rc= text_incr_decr(ptr, "incr", master_key, master_key_length, key, key_length, offset, value); + rc= text_incr_decr(ptr, "incr", group_key, group_key_length, key, key_length, offset, value); } LIBMEMCACHED_MEMCACHED_INCREMENT_END(); @@ -191,7 +191,7 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr, } memcached_return_t memcached_decrement_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value) @@ -208,13 +208,13 @@ memcached_return_t memcached_decrement_by_key(memcached_st *ptr, if (ptr->flags.binary_protocol) { rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD, value); } else { - rc= text_incr_decr(ptr, "decr", master_key, master_key_length, key, key_length, offset, value); + rc= text_incr_decr(ptr, "decr", group_key, group_key_length, key, key_length, offset, value); } LIBMEMCACHED_MEMCACHED_DECREMENT_END(); @@ -240,8 +240,8 @@ memcached_return_t memcached_increment_with_initial(memcached_st *ptr, } memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, uint64_t offset, @@ -260,7 +260,7 @@ memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START(); if (ptr->flags.binary_protocol) rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, offset, initial, (uint32_t)expiration, value); else @@ -289,8 +289,8 @@ memcached_return_t memcached_decrement_with_initial(memcached_st *ptr, } memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, uint64_t offset, @@ -310,7 +310,7 @@ memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, if (ptr->flags.binary_protocol) { rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT, - master_key, master_key_length, key, key_length, + group_key, group_key_length, key, key_length, offset, initial, (uint32_t)expiration, value); } diff --git a/libmemcached/auto.h b/libmemcached/auto.h index aa1b23dc..14ee90b5 100644 --- a/libmemcached/auto.h +++ b/libmemcached/auto.h @@ -29,14 +29,14 @@ LIBMEMCACHED_API LIBMEMCACHED_API memcached_return_t memcached_increment_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value); LIBMEMCACHED_API memcached_return_t memcached_decrement_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, uint64_t offset, uint64_t *value); @@ -61,8 +61,8 @@ LIBMEMCACHED_API LIBMEMCACHED_API memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, uint64_t offset, @@ -72,8 +72,8 @@ LIBMEMCACHED_API LIBMEMCACHED_API memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, uint64_t offset, diff --git a/libmemcached/delete.c b/libmemcached/delete.c index 9db350c1..78f08f26 100644 --- a/libmemcached/delete.c +++ b/libmemcached/delete.c @@ -52,7 +52,7 @@ static inline memcached_return_t binary_delete(memcached_st *ptr, bool flush); memcached_return_t memcached_delete_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, time_t expiration) { @@ -77,7 +77,7 @@ memcached_return_t memcached_delete_by_key(memcached_st *ptr, unlikely (memcached_server_count(ptr) == 0) return MEMCACHED_NO_SERVERS; - server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); + server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); instance= memcached_server_instance_fetch(ptr, server_key); to_write= (ptr->flags.buffer_requests) ? false : true; diff --git a/libmemcached/delete.h b/libmemcached/delete.h index 54736c0e..8d0d7eda 100644 --- a/libmemcached/delete.h +++ b/libmemcached/delete.h @@ -22,7 +22,7 @@ memcached_return_t memcached_delete(memcached_st *ptr, const char *key, size_t k LIBMEMCACHED_API memcached_return_t memcached_delete_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, time_t expiration); diff --git a/libmemcached/get.c b/libmemcached/get.c index 39f53373..46b6319c 100644 --- a/libmemcached/get.c +++ b/libmemcached/get.c @@ -25,16 +25,16 @@ char *memcached_get(memcached_st *ptr, const char *key, } static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, bool mget_mode); char *memcached_get_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, @@ -52,7 +52,7 @@ char *memcached_get_by_key(memcached_st *ptr, } /* Request the key */ - *error= memcached_mget_by_key_real(ptr, master_key, master_key_length, + *error= memcached_mget_by_key_real(ptr, group_key, group_key_length, (const char * const *)&key, &key_length, 1, false); @@ -130,15 +130,15 @@ memcached_return_t memcached_mget(memcached_st *ptr, static memcached_return_t binary_mget_by_key(memcached_st *ptr, uint32_t master_server_key, - bool is_master_key_set, + bool is_group_key_set, const char * const *keys, const size_t *key_length, size_t number_of_keys, bool mget_mode); static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, @@ -148,7 +148,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, const char *get_command= "get "; uint8_t get_command_length= 4; unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */ - bool is_master_key_set= false; + bool is_group_key_set= false; memcached_return_t rc; if ((rc= initialize_query(ptr)) != MEMCACHED_SUCCESS) @@ -167,12 +167,12 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, if (ptr->flags.verify_key && (memcached_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED)) return MEMCACHED_BAD_KEY_PROVIDED; - if (master_key && master_key_length) + if (group_key && group_key_length) { - if (ptr->flags.verify_key && (memcached_key_test((const char * const *)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) + if (ptr->flags.verify_key && (memcached_key_test((const char * const *)&group_key, &group_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) return MEMCACHED_BAD_KEY_PROVIDED; - master_server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); - is_master_key_set= true; + master_server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); + is_group_key_set= true; } /* @@ -200,7 +200,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, if (ptr->flags.binary_protocol) { - return binary_mget_by_key(ptr, master_server_key, is_master_key_set, keys, + return binary_mget_by_key(ptr, master_server_key, is_group_key_set, keys, key_length, number_of_keys, mget_mode); } @@ -221,7 +221,7 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, memcached_server_write_instance_st instance; uint32_t server_key; - if (is_master_key_set) + if (is_group_key_set) { server_key= master_server_key; } @@ -317,13 +317,13 @@ static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr, } memcached_return_t memcached_mget_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys) { - return memcached_mget_by_key_real(ptr, master_key, master_key_length, keys, + return memcached_mget_by_key_real(ptr, group_key, group_key_length, keys, key_length, number_of_keys, true); } @@ -341,8 +341,8 @@ memcached_return_t memcached_mget_execute(memcached_st *ptr, } memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, @@ -362,7 +362,7 @@ memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr, }; ptr->callbacks= &cb; - rc= memcached_mget_by_key(ptr, master_key, master_key_length, keys, + rc= memcached_mget_by_key(ptr, group_key, group_key_length, keys, key_length, number_of_keys); ptr->callbacks= original_callbacks; return rc; @@ -370,7 +370,7 @@ memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr, static memcached_return_t simple_binary_mget(memcached_st *ptr, uint32_t master_server_key, - bool is_master_key_set, + bool is_group_key_set, const char * const *keys, const size_t *key_length, size_t number_of_keys, bool mget_mode) @@ -388,7 +388,7 @@ static memcached_return_t simple_binary_mget(memcached_st *ptr, uint32_t server_key; memcached_server_write_instance_st instance; - if (is_master_key_set) + if (is_group_key_set) { server_key= master_server_key; } @@ -592,7 +592,7 @@ static memcached_return_t replication_binary_mget(memcached_st *ptr, static memcached_return_t binary_mget_by_key(memcached_st *ptr, uint32_t master_server_key, - bool is_master_key_set, + bool is_group_key_set, const char * const *keys, const size_t *key_length, size_t number_of_keys, @@ -602,7 +602,7 @@ static memcached_return_t binary_mget_by_key(memcached_st *ptr, if (ptr->number_of_replicas == 0) { - rc= simple_binary_mget(ptr, master_server_key, is_master_key_set, + rc= simple_binary_mget(ptr, master_server_key, is_group_key_set, keys, key_length, number_of_keys, mget_mode); } else @@ -620,7 +620,7 @@ static memcached_return_t binary_mget_by_key(memcached_st *ptr, return MEMCACHED_MEMORY_ALLOCATION_FAILURE; } - if (is_master_key_set) + if (is_group_key_set) { for (size_t x= 0; x < number_of_keys; x++) { diff --git a/libmemcached/get.h b/libmemcached/get.h index a6d6b264..61e34356 100644 --- a/libmemcached/get.h +++ b/libmemcached/get.h @@ -32,7 +32,7 @@ memcached_return_t memcached_mget(memcached_st *ptr, LIBMEMCACHED_API char *memcached_get_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, size_t *value_length, uint32_t *flags, @@ -40,8 +40,8 @@ char *memcached_get_by_key(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_mget_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char * const *keys, const size_t *key_length, const size_t number_of_keys); @@ -70,8 +70,8 @@ memcached_return_t memcached_mget_execute(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char * const *keys, const size_t *key_length, size_t number_of_keys, diff --git a/libmemcached/storage.c b/libmemcached/storage.c index 331c7fae..135def30 100644 --- a/libmemcached/storage.c +++ b/libmemcached/storage.c @@ -57,7 +57,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr, memcached_storage_action_t verb); static inline memcached_return_t memcached_send(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -86,7 +86,7 @@ static inline memcached_return_t memcached_send(memcached_st *ptr, if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) return MEMCACHED_BAD_KEY_PROVIDED; - server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length); + server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length); instance= memcached_server_instance_fetch(ptr, server_key); WATCHPOINT_SET(instance->io_wait_count.read= 0); @@ -311,8 +311,8 @@ memcached_return_t memcached_cas(memcached_st *ptr, } memcached_return_t memcached_set_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, + const char *group_key, + size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -320,7 +320,7 @@ memcached_return_t memcached_set_by_key(memcached_st *ptr, { memcached_return_t rc; LIBMEMCACHED_MEMCACHED_SET_START(); - rc= memcached_send(ptr, master_key, master_key_length, + rc= memcached_send(ptr, group_key, group_key_length, key, key_length, value, value_length, expiration, flags, 0, SET_OP); LIBMEMCACHED_MEMCACHED_SET_END(); @@ -328,7 +328,7 @@ memcached_return_t memcached_set_by_key(memcached_st *ptr, } memcached_return_t memcached_add_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -336,7 +336,7 @@ memcached_return_t memcached_add_by_key(memcached_st *ptr, { memcached_return_t rc; LIBMEMCACHED_MEMCACHED_ADD_START(); - rc= memcached_send(ptr, master_key, master_key_length, + rc= memcached_send(ptr, group_key, group_key_length, key, key_length, value, value_length, expiration, flags, 0, ADD_OP); LIBMEMCACHED_MEMCACHED_ADD_END(); @@ -344,7 +344,7 @@ memcached_return_t memcached_add_by_key(memcached_st *ptr, } memcached_return_t memcached_replace_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -352,7 +352,7 @@ memcached_return_t memcached_replace_by_key(memcached_st *ptr, { memcached_return_t rc; LIBMEMCACHED_MEMCACHED_REPLACE_START(); - rc= memcached_send(ptr, master_key, master_key_length, + rc= memcached_send(ptr, group_key, group_key_length, key, key_length, value, value_length, expiration, flags, 0, REPLACE_OP); LIBMEMCACHED_MEMCACHED_REPLACE_END(); @@ -360,35 +360,35 @@ memcached_return_t memcached_replace_by_key(memcached_st *ptr, } memcached_return_t memcached_prepend_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return_t rc; - rc= memcached_send(ptr, master_key, master_key_length, + rc= memcached_send(ptr, group_key, group_key_length, key, key_length, value, value_length, expiration, flags, 0, PREPEND_OP); return rc; } memcached_return_t memcached_append_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, uint32_t flags) { memcached_return_t rc; - rc= memcached_send(ptr, master_key, master_key_length, + rc= memcached_send(ptr, group_key, group_key_length, key, key_length, value, value_length, expiration, flags, 0, APPEND_OP); return rc; } memcached_return_t memcached_cas_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -396,7 +396,7 @@ memcached_return_t memcached_cas_by_key(memcached_st *ptr, uint64_t cas) { memcached_return_t rc; - rc= memcached_send(ptr, master_key, master_key_length, + rc= memcached_send(ptr, group_key, group_key_length, key, key_length, value, value_length, expiration, flags, cas, CAS_OP); return rc; diff --git a/libmemcached/storage.h b/libmemcached/storage.h index 58edb479..48e544c0 100644 --- a/libmemcached/storage.h +++ b/libmemcached/storage.h @@ -56,7 +56,7 @@ memcached_return_t memcached_cas(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_set_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -64,7 +64,7 @@ memcached_return_t memcached_set_by_key(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_add_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -72,7 +72,7 @@ memcached_return_t memcached_add_by_key(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_replace_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -80,7 +80,7 @@ memcached_return_t memcached_replace_by_key(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_prepend_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -88,7 +88,7 @@ memcached_return_t memcached_prepend_by_key(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_append_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, @@ -96,7 +96,7 @@ memcached_return_t memcached_append_by_key(memcached_st *ptr, LIBMEMCACHED_API memcached_return_t memcached_cas_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, + const char *group_key, size_t group_key_length, const char *key, size_t key_length, const char *value, size_t value_length, time_t expiration, -- 2.30.2