Merge pull request #2384 from basho/ej/kv/port-changes

Port in changes made to current docs to previous docs

Author: Lauren

content/riak/kv/2.0.0/developing/api/protocol-buffers/dt-fetch.md

@@ -68,7 +68,7 @@ Parameter | Description
 `timeout` | The timeout duration, in milliseconds, after which Riak will return an error message
 `sloppy_quorum` | If this parameter is set to `true`, the next available node in the ring will accept requests if any primary node is unavailable
 `n_val` | The number of nodes to which the delete request will be sent
-`include_context` | If `return_body` is set to `true`, the Data Type's opaque "context" will be returned to the client when the `DtUpdateResp` is sent to the client.
+`include_context` | If this parameter is set to `true`, the Data Type's opaque "context" will be returned to the client
 
 ## Response
 
@@ -124,4 +124,3 @@ message MapEntry {
     repeated MapEntry map_value      = 6;
 }
 ```
-

content/riak/kv/2.0.0/developing/api/protocol-buffers/yz-schema-put.md

@@ -35,3 +35,7 @@ message RpbYokozunaSchema {
 ```
 
 This message *must* include both the schema `name` and its Solr [search schema](/riak/kv/2.0.0/developing/usage/search-schemas) `content` as XML.
+
+## Response
+
+Returns a [RpbPutResp](/riak/kv/2.0.0/developing/api/protocol-buffers/#message-codes) code with no data on success.

content/riak/kv/2.0.0/developing/getting-started/java.md

@@ -31,7 +31,7 @@ project's dependencies. Here is a Maven example:
   <dependency>
     <groupId>com.basho.riak</groupId>
     <artifactId>riak-client</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.1</version>
   </dependency
 </dependencies>
 ```

content/riak/kv/2.0.0/developing/getting-started/java/crud-operations.md

@@ -30,7 +30,7 @@ StoreValue storeOp = new StoreValue.Builder(quoteObject)
         .build();
 ```
 
-In line 76 we use our `client` object to execute the storage operation:
+We then use our `client` object to execute the storage operation:
 
 ```java
 StoreValue.Response response = client.execute(storeOp);
@@ -53,6 +53,24 @@ If the values are equal, as they should be, the Java client will say
 `Success!  The object we created and the object we fetched have the same
 value`. If not, then the client will throw an exception.
 
+## Updating Objects
+
+Once we've read the object back in from Riak, we can update the object
+and store it back as we did before with the `StoreValue` object:
+
+```java
+fetchedObject.setValue(BinaryValue.create("You can be my wingman any time."));
+StoreValue updateOp = new StoreValue.Builder(fetchedObject)
+        .withLocation(quoteObjectLocation)
+        .build();
+StoreValue.Response updateOpResp = client.execute(updateOp);
+```
+
+For more in depth information on updating objects and sibling resolution in
+Riak, see [Updating Objects](/riak/kv/2.0.0/developing/usage/updating-objects/)
+and [Conflict Resolution](/riak/kv/2.0.0/developing/usage/conflict-resolution/)
+documentation.
+
 ## Deleting Objects
 
 Now that we've stored and then fetched the object, we can delete it by
@@ -117,3 +135,49 @@ If we fetch the object (using the same method we showed up above and in
   "copiesOwned": 3
 }
 ```
+
+Since we really like Moby Dick, let's buy a couple more copies
+and update the POJO.
+
+To update the POJO, we would use `UpdateValue` by
+extending a new `BookUpdate` class as follows:
+
+```java
+public static class BookUpdate extends UpdateValue.Update<Book> {
+    private final Book update;
+    public BookUpdate(Book update){
+        this.update = update;
+    }
+
+    @Override
+    public Book apply(Book t) {
+        if(t == null) {
+            t = new Book();
+        }
+
+        t.author = update.author;
+        t.body = update.body;
+        t.copiesOwned = update.copiesOwned;
+        t.isbn = update.isbn;
+        t.title = update.title;
+
+        return t;
+    }
+}
+```
+
+Then using the `BookUpdate` class with our `mobyDick` object:
+
+```java
+mobyDick.copiesOwned = 5;
+BookUpdate updatedBook = new BookUpdate(mobyDick);
+
+UpdateValue updateValue = new UpdateValue.Builder(mobyDickLocation)
+    .withUpdate(updatedBook).build();
+UpdateValue.Response response = client.execute(updateValue);
+```
+
+For more in depth information on updating objects and sibling resolution in
+Riak, see [Updating Objects](/riak/kv/2.0.0/developing/usage/updating-objects/)
+and [Conflict Resolution](/riak/kv/2.0.0/developing/usage/conflict-resolution/)
+documention.

content/riak/kv/2.0.0/using/cluster-operations/v3-multi-datacenter.md

@@ -285,7 +285,7 @@ Display this cluster's cluster-id tuple, for use with the
 included when passed to `*-block-provider-redirect`.
 
 * Syntax: `riak-repl show-local-cluster-id`
-* Example: 
+* Example:
 
     ```bash
     riak-repl show-local-cluster-id
@@ -363,8 +363,8 @@ replication bucket hooks with the `riak-repl modes` command.
 `modelist` is one or both of `mode_repl12` (Version 2) or `mode_repl13`
 (Version 3) separated by spaces (without commas).
 
-* Syntax: `riak-repl modes <modelist>` 
-* Example: 
+* Syntax: `riak-repl modes <modelist>`
+* Example:
 
     ```bash
     riak-repl modes mode_repl12 mode_repl13
@@ -378,7 +378,7 @@ replication bucket hooks with the `riak-repl modes` command.
 
 To check the current replication modes:
 
-* Syntax: `riak-repl modes` 
+* Syntax: `riak-repl modes`
 * Example:
 
     ```bash
@@ -390,3 +390,32 @@ To check the current replication modes:
     ```
     Current replication modes: [mode_repl12,mode_repl13]
     ```
+
+## Configurations and Metadata in Replication
+
+Fullsync and Realtime replication replicates data from source clusters to sink clusters,
+but some configurations and metadata (such as search indices and bucket properties) will
+not be replicated.
+
+Non-replication of certain configurations and metadata supports
+heterogenous cluster configurations in Replication, but there operational things you can
+do when you want homogeneous cluster configurations.
+
+### Search Indices in Replication
+
+Any search index that is created on a source cluster will _not_ be
+created on sink clusters as part of replication.
+
+If you want search indices on a source cluster to be present on the
+sink clusters, you should update this data for each
+cluster at the same time you would change the source cluster.
+
+### Buckets and Bucket Types in Replication
+
+Buckets and Bucket Type properties on the source cluster
+will _not_ be replicated from source clusters to sink clusters.
+
+If you want the properties for Buckets or Bucket Types
+present on the source cluster to be propagated to sink clusters
+you should update this data for each cluster at the same
+time you would change the source cluster.

content/riak/kv/2.0.1/developing/api/protocol-buffers/dt-fetch.md

@@ -68,7 +68,7 @@ Parameter | Description
 `timeout` | The timeout duration, in milliseconds, after which Riak will return an error message
 `sloppy_quorum` | If this parameter is set to `true`, the next available node in the ring will accept requests if any primary node is unavailable
 `n_val` | The number of nodes to which the delete request will be sent
-`include_context` | If `return_body` is set to `true`, the Data Type's opaque "context" will be returned to the client when the `DtUpdateResp` is sent to the client.
+`include_context` | If this parameter is set to `true`, the Data Type's opaque "context" will be returned to the client
 
 ## Response
 
@@ -124,4 +124,3 @@ message MapEntry {
     repeated MapEntry map_value      = 6;
 }
 ```
-

content/riak/kv/2.0.1/developing/api/protocol-buffers/yz-schema-put.md

@@ -35,3 +35,7 @@ message RpbYokozunaSchema {
 ```
 
 This message *must* include both the schema `name` and its Solr [search schema](/riak/kv/2.0.1/developing/usage/search-schemas) `content` as XML.
+
+## Response
+
+Returns a [RpbPutResp](/riak/kv/2.0.1/developing/api/protocol-buffers/#message-codes) code with no data on success.

content/riak/kv/2.0.1/developing/getting-started/java.md

@@ -31,7 +31,7 @@ project's dependencies. Here is a Maven example:
   <dependency>
     <groupId>com.basho.riak</groupId>
     <artifactId>riak-client</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.1</version>
   </dependency
 </dependencies>
 ```

content/riak/kv/2.0.1/developing/getting-started/java/crud-operations.md

@@ -30,7 +30,7 @@ StoreValue storeOp = new StoreValue.Builder(quoteObject)
         .build();
 ```
 
-In line 76 we use our `client` object to execute the storage operation:
+We then use our `client` object to execute the storage operation:
 
 ```java
 StoreValue.Response response = client.execute(storeOp);
@@ -53,6 +53,24 @@ If the values are equal, as they should be, the Java client will say
 `Success!  The object we created and the object we fetched have the same
 value`. If not, then the client will throw an exception.
 
+## Updating Objects
+
+Once we've read the object back in from Riak, we can update the object
+and store it back as we did before with the `StoreValue` object:
+
+```java
+fetchedObject.setValue(BinaryValue.create("You can be my wingman any time."));
+StoreValue updateOp = new StoreValue.Builder(fetchedObject)
+        .withLocation(quoteObjectLocation)
+        .build();
+StoreValue.Response updateOpResp = client.execute(updateOp);
+```
+
+For more in depth information on updating objects and sibling resolution in
+Riak, see [Updating Objects](/riak/kv/2.0.1/developing/usage/updating-objects/)
+and [Conflict Resolution](/riak/kv/2.0.1/developing/usage/conflict-resolution/)
+documentation.
+
 ## Deleting Objects
 
 Now that we've stored and then fetched the object, we can delete it by
@@ -117,3 +135,49 @@ If we fetch the object (using the same method we showed up above and in
   "copiesOwned": 3
 }
 ```
+
+Since we really like Moby Dick, let's buy a couple more copies
+and update the POJO.
+
+To update the POJO, we would use `UpdateValue` by
+extending a new `BookUpdate` class as follows:
+
+```java
+public static class BookUpdate extends UpdateValue.Update<Book> {
+    private final Book update;
+    public BookUpdate(Book update){
+        this.update = update;
+    }
+
+    @Override
+    public Book apply(Book t) {
+        if(t == null) {
+            t = new Book();
+        }
+
+        t.author = update.author;
+        t.body = update.body;
+        t.copiesOwned = update.copiesOwned;
+        t.isbn = update.isbn;
+        t.title = update.title;
+
+        return t;
+    }
+}
+```
+
+Then using the `BookUpdate` class with our `mobyDick` object:
+
+```java
+mobyDick.copiesOwned = 5;
+BookUpdate updatedBook = new BookUpdate(mobyDick);
+
+UpdateValue updateValue = new UpdateValue.Builder(mobyDickLocation)
+    .withUpdate(updatedBook).build();
+UpdateValue.Response response = client.execute(updateValue);
+```
+
+For more in depth information on updating objects and sibling resolution in
+Riak, see [Updating Objects](/riak/kv/2.0.1/developing/usage/updating-objects/)
+and [Conflict Resolution](/riak/kv/2.0.1/developing/usage/conflict-resolution/)
+documention.

content/riak/kv/2.0.1/using/cluster-operations/v3-multi-datacenter.md

@@ -285,7 +285,7 @@ Display this cluster's cluster-id tuple, for use with the
 included when passed to `*-block-provider-redirect`.
 
 * Syntax: `riak-repl show-local-cluster-id`
-* Example: 
+* Example:
 
     ```bash
     riak-repl show-local-cluster-id
@@ -363,8 +363,8 @@ replication bucket hooks with the `riak-repl modes` command.
 `modelist` is one or both of `mode_repl12` (Version 2) or `mode_repl13`
 (Version 3) separated by spaces (without commas).
 
-* Syntax: `riak-repl modes <modelist>` 
-* Example: 
+* Syntax: `riak-repl modes <modelist>`
+* Example:
 
     ```bash
     riak-repl modes mode_repl12 mode_repl13
@@ -378,7 +378,7 @@ replication bucket hooks with the `riak-repl modes` command.
 
 To check the current replication modes:
 
-* Syntax: `riak-repl modes` 
+* Syntax: `riak-repl modes`
 * Example:
 
     ```bash
@@ -390,3 +390,32 @@ To check the current replication modes:
     ```
     Current replication modes: [mode_repl12,mode_repl13]
     ```
+
+## Configurations and Metadata in Replication
+
+Fullsync and Realtime replication replicates data from source clusters to sink clusters,
+but some configurations and metadata (such as search indices and bucket properties) will
+not be replicated.
+
+Non-replication of certain configurations and metadata supports
+heterogenous cluster configurations in Replication, but there operational things you can
+do when you want homogeneous cluster configurations.
+
+### Search Indices in Replication
+
+Any search index that is created on a source cluster will _not_ be
+created on sink clusters as part of replication.
+
+If you want search indices on a source cluster to be present on the
+sink clusters, you should update this data for each
+cluster at the same time you would change the source cluster.
+
+### Buckets and Bucket Types in Replication
+
+Buckets and Bucket Type properties on the source cluster
+will _not_ be replicated from source clusters to sink clusters.
+
+If you want the properties for Buckets or Bucket Types
+present on the source cluster to be propagated to sink clusters
+you should update this data for each cluster at the same
+time you would change the source cluster.