Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaked Javadoc, spec for Map/Reduce

Browse Source
This commit is contained in:
J. Brisbin
2010-11-23 15:26:15 -06:00
parent 7e08fafd49
commit 23c9b7fcae
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-datastore-riak/src/main/java/org/springframework/datastore/riak/core/RiakTemplate.java
View File

@@ -62,18 +62,17 @@ import java.util.regex.Pattern;
/**
* An implementation of {@link org.springframework.datastore.riak.core.KeyValueStoreOperations}
* and {@link org.springframework.datastore.riak.mapreduce.MapReduceOperations}
* for the Riak data store.
* and {@link org.springframework.datastore.riak.mapreduce.MapReduceOperations} for the Riak
* data store.
* <p/>
* To use the RiakTemplate, create a singleton in your Spring
* application-context.xml:
* To use the RiakTemplate, create a singleton in your Spring application-context.xml:
* <pre><code>
* &lt;bean id="riak" class="org.springframework.datastore.riak.core.RiakTemplate"
* p:defaultUri="http://localhost:8098/riak/{bucket}/{key}"
* p:mapReduceUri="http://localhost:8098/mapred"/>
* </code></pre>
* To store and retrieve objects in Riak, use the setXXX and getXXX methods
* (example in Groovy):
* To store and retrieve objects in Riak, use the setXXX and getXXX methods (example in
* Groovy):
* <pre><code>
* def obj = new TestObject(name: "My Name", age: 40)
* riak.set([bucket: "mybucket", key: "mykey"], obj)
@@ -81,13 +80,13 @@ import java.util.regex.Pattern;
* def name = riak.get([bucket: "mybucket", key: "mykey"]).name
* println "Hello $name!"
* </code></pre>
* You're key object should be one of: <ul><li>A <code>String</code> encoding
* the bucket and key together, separated by a colon. e.g. "mybucket:mykey"</li>
* <li>An implementation of BucketKeyPair (like {@link org.springframework.datastore.riak.core.SimpleBucketKeyPair})</li>
* You're key object should be one of: <ul><li>A <code>String</code> encoding the bucket and key
* together, separated by a colon. e.g. "mybucket:mykey"</li> <li>An implementation of
* BucketKeyPair (like {@link org.springframework.datastore.riak.core.SimpleBucketKeyPair})</li>
* <li>A <code>Map</code> with both a "bucket" and a "key" specified.</li> <li>A
* <code>String</code> of only the key name, but specifying a bucket by using
* the {@link org.springframework.datastore.riak.convert.KeyValueStoreMetaData}
* annotation on the object you're storing.</li></ul>
* <code>String</code> of only the key name, but specifying a bucket by using the {@link
* org.springframework.datastore.riak.convert.KeyValueStoreMetaData} annotation on the object
* you're storing.</li></ul>
*
* @author J. Brisbin <jon@jbrisbin.com>
*/
@@ -141,7 +140,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe
*/
protected String mapReduceUri = "http://localhost:8098/mapred";
/**
* A list of resolvers to turn a single object into a {#link BucketKeyPair}.
* A list of resolvers to turn a single object into a {@link BucketKeyPair}.
*/
protected List<BucketKeyResolver> bucketKeyResolvers;
@@ -704,7 +703,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe
BucketKeyPair bucketKeyPair;
if (null != resolver) {
bucketKeyPair = resolver.resolve(key);
if (null != val) {
if (null == bucketKeyPair.getBucket() && null != val) {
Annotation meta = (val instanceof Class ? (Class) val : val.getClass()).getAnnotation(
KeyValueStoreMetaData.class);
if (null != meta) {

5
spring-datastore-riak/src/test/groovy/org/springframework/datastore/riak/core/RiakTemplateSpec.groovy
View File

@@ -160,10 +160,10 @@ class RiakTemplateSpec extends Specification {
given:
MapReduceJob job = riak.createMapReduceJob()
def mapJs = new JavascriptMapReduceOperation("function(v){ ejsLog('/tmp/mapred.log', 'map='+JSON.stringify(v)); var o=Riak.mapValuesJson(v); return [1]; }")
def mapJs = new JavascriptMapReduceOperation("function(v){ return [1]; }")
def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs)
def reduceJs = new JavascriptMapReduceOperation("function(v){ ejsLog('/tmp/mapred.log', 'reduce='+JSON.stringify(v)); return [v.length]; }")
def reduceJs = new JavascriptMapReduceOperation("function(v){ return [v.length]; }")
def reducePhase = new RiakMapReducePhase("reduce", "javascript", reduceJs)
job.addInputs(["test"]).
@@ -171,7 +171,6 @@ class RiakTemplateSpec extends Specification {
addPhase(reducePhase)
when:
println "M/R: ${job.toJson()}"
def result = riak.execute(job, List)
then: