Merge in updates to the documentation.

diff --git a/docs/libmemcached.rst b/docs/libmemcached.rst
index c60cf99c352ebc97ddd3eaf0eb6a84c1a1631eb4..ddf3108e08113d59d24598ffe77d8cd19f91323f 100644 (file)
--- 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 52f346f763cd8345398a13ea1a32c506fb4842ef..96f6f4e24fefa6c42a947291bd82fcee5996cdad 100644 (file)
--- 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 3416bd37a3f56a9014b9fd206409c720abe2ba24..3bb6739c7a3032ad3b95a1d8de712ba5506c25f0 100644 (file)
--- 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 b045999fc4f925630f60a9635cc014ce037b8dea..67fa23422e85550e20fbccc610f7190436f89498 100644 (file)
--- 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 2d53404466f980c2099b306d7ba97423329d13a2..970270043ce0d10109245dc68dedca6c433942f3 100644 (file)
--- 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 3652dbb07203c7be06eb385ac590863f68dbf112..42bf275ddf874a827fd42525e0b280ff17c73083 100644 (file)
--- 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 d1ebf8aaaf357a9756a770fc10cb61fd0afc3d2b..f63a1ae2683ea78b96cac3d5d98cfd6906475ee9 100644 (file)
--- 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 a91d4e594ed9e2953056e3011345a289052e8e8d..953aac18f2021c64b01faaf150baadaaabaa7464 100644 (file)
--- 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 866c7d8a016e38dc9cdee53684806f6165d7e202..49d603bb1154f7da44f503719b447caddf52d2f3 100644 (file)
--- 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 5d5b7c07f1deea380118d272d9197df08dfd20a7..bf5b979719b0edc534eab4bc7dcacc7a293c7120 100644 (file)
--- 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 8475f737fca45dc7d2f911838bee41b0619ee470..8fad70a9d64b5a7821e6bdb8e789987ea5aeca44 100644 (file)
--- 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 13ab430377fc7d669bfc359c242a7e0604e4fa06..b846b86e29671b89a3888332a3600d91dd6f7909 100644 (file)
--- 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 321e4d218fb8b7e3097c31f989e6f2c32f8d96af..7d476979aaf89604a87563ecf6a3a6fbcc5ef63e 100644 (file)
--- 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 6c00358807d4ffcd8da17ef61292ef57e5237cd4..b1b34c3dc3a180de0c947445641864475b87f25f 100644 (file)
--- 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 3d34ee89abcb433d8d51b25b75134c6dcca6564e..2c716fec6ad29f6ba5eedb624adc377e13be3829 100644 (file)
--- 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 5ae03ec5c43635183b862319b5031f5091fd91aa..f5afaccb9b4c5df5f5c6cd895b33e353e479f56f 100644 (file)
--- 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 3b9892e637c0c92e72e916e0b9935aec78746237..519d56f22ce1d4b8ef4ae5aeabe05afbc0665747 100644 (file)
--- 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 25757c8137dd4321efd0cbd176a4a12f65cecd10..39bd87090dc23ff3694a7fecf49f40ee7835af21 100644 (file)
--- 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 c3b7d0ab2100344320db62439e3d0ca4ede1764d..7e488991c398bcbcf2f75b89768881b17e0d3a58 100644 (file)
--- 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 d542ded595abca4ba31ef3759f1d046f8ba00521..45a306dd23a3b06687f6b30e66bbd0c6232ebf53 100644 (file)
--- 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 05f023c66bf667f57300593e8e22003cc8ee0f1b..ea841db39d1ba8c5a6c85327ffc2db8461816483 100644 (file)
--- 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 15040a7aa60f7371f6a39c688f46af4cd6304be6..3f4616e5f1f9b1b7090d1d183dcc4c24bc3dc748 100644 (file)
--- 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 4097c2897337570d598bc825fe5f5be76557c32c..9eb34f5afd739a1a37d82f852f53a3b06a524610 100644 (file)
--- 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 1bf688068f0e0ab6d4b57afc18cb45c08caedf74..0aca15f5a6b4bedc844e6a74ef618d54a5d73e29 100644 (file)
--- 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 ae318832faea8c2ccffc19f6916962d250a13190..ffe7f082a541a65ef9752c8cfa9dea396965dda2 100644 (file)
--- 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 d3dd972c9b19010ef1e5d2be96f15dcf1ffd80a3..c56596d3562452c1530def24f603bff0f8d66860 100644 (file)
--- 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 0c31598b9a39b3102902feefc02af81e0f6a2a06..698813b6e86cf60f529ac8aa3e3a54e7eafe9a14 100644 (file)
--- 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 d89ff8aab166163488e2505c9c9d152534d8cfba..c28e959895867f350118ea1e8c5d4304fdb2aab7 100644 (file)
--- 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 76350727539d143c83ae5d2d3bd3def68b43a489..63c4ea4c300c702971185e286806fd72a9a83510 100644 (file)
--- 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 f9c062d2ba9887fd179d669b0eaf11dd944ce4e9..e81ea0f135dc3e8d5bfa67e23202735d47035983 100644 (file)
--- 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 39b4247a6436bf08c864a226ebb751fb5402d441..fab217f928f83c5b5be5816a5c53e2fe5203a80c 100644 (file)
--- 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 85ecef7ed9b6ec2927a84d310c4c7c40a74b2e74..6082094a23c43f88838f10df6dc2804b2e1beeec 100644 (file)
--- 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 ea0c6355cbc92030c5d88660bbeb2a8ba7ef06bb..c857b3290a3d26bc6ec966ec41e60b8ef38dfe39 100644 (file)
--- 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 2d026fa730e26bec799bb3c4fd69c791de396b0d..ec6c60e200449a39f1f6d49072ed40707c33569a 100644 (file)
--- 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 7bd0cc12518c100521466635c4f85f3901e967df..325ddb6b7d49721b1b34d4d955557045097a0ad7 100644 (file)
--- 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 aa1b23dc8fd2075053ed841393df1e0011007969..14ee90b54caa01740e8e10d533516b46956f1b41 100644 (file)
--- 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 9db350c14c823eba203e16005cb4dff7844343fe..78f08f26292376bb65f4a6a67c81952379bc2bc1 100644 (file)
--- 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 54736c0e2aa185b7c6b37a848cf6eec74a0204de..8d0d7eda880ea7f65822c206b8db79f4140af0b3 100644 (file)
--- 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 39f53373ce10f1be185a6478bfad11a3d8175ae0..46b6319c564e16a8b5c902064e7df5bcb9e06239 100644 (file)
--- 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 a6d6b264498e79e102b456fa66548ccc6a9c23af..61e34356696fd61872aed14720068d6abb4d0cb3 100644 (file)
--- 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 331c7fae9ce7a985d2b906187657cfb9322d2c1b..135def3005a7fa38809a46c9b55b3b32bb082bd3 100644 (file)
--- 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 58edb4798176df60abbcf2d9f4370e820a31ef6a..48e544c00fb87fa0f67c810aeb97614fad81fd42 100644 (file)
--- 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,