GitHub-Spring
/
spring-data-mongodb
mirror of https://github.com/spring-projects/spring-data-mongodb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

DATAMONGO-2027 - Polishing. 

Remove duplicate tests and fix assertions on existing ones. Move tests over to AssertJ and fix output database not applied correctly.

Original Pull Request: #588
pull/589/merge
Christoph Strobl 7 years ago
parent
d4f351a37c
commit
ff6f5d9ef3
6 changed files with 262 additions and 164 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
  2. 16
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
  3. 15
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptions.java
  4. 50
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java
  5. 312
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
  6. 19
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ReactiveMapReduceTests.java

14
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
Unescape View File

@ -1797,23 +1797,31 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware, @@ -1797,23 +1797,31 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
if (!CollectionUtils.isEmpty(mapReduceOptions.getScopeVariables())) {
mapReduce = mapReduce.scope(new Document(mapReduceOptions.getScopeVariables()));
}
if (mapReduceOptions.getLimit() != null && mapReduceOptions.getLimit() > 0) {
mapReduce = mapReduce.limit(mapReduceOptions.getLimit());
}
if (mapReduceOptions.getFinalizeFunction().filter(StringUtils::hasText).isPresent()) {
mapReduce = mapReduce.finalizeFunction(mapReduceOptions.getFinalizeFunction().get());
}
if (mapReduceOptions.getJavaScriptMode() != null) {
mapReduce = mapReduce.jsMode(mapReduceOptions.getJavaScriptMode());
}
if (mapReduceOptions.getOutputSharded().isPresent()) {
mapReduce = mapReduce.sharded(mapReduceOptions.getOutputSharded().get());
}
MapReduceAction action = mapReduceOptions.getMapReduceAction();
if (StringUtils.hasText(mapReduceOptions.getOutputCollection()) && !mapReduceOptions.usesInlineOutput()) {
mapReduce = mapReduce.collectionName(mapReduceOptions.getOutputCollection())
.action(mapReduceOptions.getMapReduceAction());
if(action != null && mapReduceOptions.getOutputCollection() != null){
mapReduce = mapReduce.action(action).collectionName(mapReduceOptions.getOutputCollection());
if (mapReduceOptions.getOutputDatabase().isPresent()) {
mapReduce = mapReduce.databaseName(mapReduceOptions.getOutputDatabase().get());
}
}
}

16
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
Unescape View File

@ -1977,10 +1977,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati @@ -1977,10 +1977,6 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
MapReducePublisher<Document> publisher = collection.mapReduce(mapFunction, reduceFunction, Document.class);
if (StringUtils.hasText(options.getOutputCollection())) {
publisher = publisher.collectionName(options.getOutputCollection());
}
publisher.filter(mappedQuery);
publisher.sort(getMappedSortObject(filterQuery, domainType));
@ -2018,23 +2014,29 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati @@ -2018,23 +2014,29 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
if (!CollectionUtils.isEmpty(options.getScopeVariables())) {
publisher = publisher.scope(new Document(options.getScopeVariables()));
}
if (options.getLimit() != null && options.getLimit() > 0) {
publisher = publisher.limit(options.getLimit());
}
if (options.getFinalizeFunction().filter(StringUtils::hasText).isPresent()) {
publisher = publisher.finalizeFunction(options.getFinalizeFunction().get());
}
if (options.getJavaScriptMode() != null) {
publisher = publisher.jsMode(options.getJavaScriptMode());
}
if (options.getOutputSharded().isPresent()) {
publisher = publisher.sharded(options.getOutputSharded().get());
}
MapReduceAction action = options.getMapReduceAction();
if (StringUtils.hasText(options.getOutputCollection()) && !options.usesInlineOutput()) {
publisher = publisher.collectionName(options.getOutputCollection()).action(options.getMapReduceAction());
if (action != null && options.getOutputCollection() != null) {
publisher = publisher.action(action).collectionName(options.getOutputCollection());
if (options.getOutputDatabase().isPresent()) {
publisher = publisher.databaseName(options.getOutputDatabase().get());
}
}
publisher = collation.map(Collation::toMongoCollation).map(publisher::collation).orElse(publisher);

15
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptions.java
Unescape View File

@ -24,6 +24,7 @@ import org.springframework.data.mongodb.core.query.Collation; @@ -24,6 +24,7 @@ import org.springframework.data.mongodb.core.query.Collation;
import org.springframework.lang.Nullable;
import com.mongodb.MapReduceCommand;
import com.mongodb.MapReduceCommand.OutputType;
import com.mongodb.client.model.MapReduceAction;
/**
@ -300,7 +301,7 @@ public class MapReduceOptions { @@ -300,7 +301,7 @@ public class MapReduceOptions {
* Return the {@link MapReduceAction} derived from {@link com.mongodb.MapReduceCommand.OutputType}.
*
* @return the mapped action or {@literal null} if the action maps to inline output.
* @since 2.0.9
* @since 2.0.10
*/
@Nullable
public MapReduceAction getMapReduceAction() {
@ -312,9 +313,19 @@ public class MapReduceOptions { @@ -312,9 +313,19 @@ public class MapReduceOptions {
return MapReduceAction.REDUCE;
case REPLACE:
return MapReduceAction.REPLACE;
case INLINE:
return null;
default:
throw new IllegalStateException(String.format("Unknown output type %s for map reduce command.", outputType));
}
}
return null;
/**
* @return {@literal true} if {@link OutputType#INLINE} is used.
* @since 2.0.10
*/
public boolean usesInlineOutput() {
return OutputType.INLINE.equals(outputType);
}
public Document getOptionsObject() {

50
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java
Unescape View File

@ -92,6 +92,7 @@ import com.mongodb.client.model.CountOptions; @@ -92,6 +92,7 @@ import com.mongodb.client.model.CountOptions;
import com.mongodb.client.model.DeleteOptions;
import com.mongodb.client.model.FindOneAndDeleteOptions;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.MapReduceAction;
import com.mongodb.client.model.ReplaceOptions;
import com.mongodb.client.model.UpdateOptions;
import com.mongodb.client.result.UpdateResult;
@ -144,6 +145,9 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { @@ -144,6 +145,9 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
when(mapReduceIterable.sort(any())).thenReturn(mapReduceIterable);
when(mapReduceIterable.iterator()).thenReturn(cursor);
when(mapReduceIterable.filter(any())).thenReturn(mapReduceIterable);
when(mapReduceIterable.collectionName(any())).thenReturn(mapReduceIterable);
when(mapReduceIterable.databaseName(any())).thenReturn(mapReduceIterable);
when(mapReduceIterable.action(any())).thenReturn(mapReduceIterable);
when(aggregateIterable.collation(any())).thenReturn(aggregateIterable);
when(aggregateIterable.allowDiskUse(any())).thenReturn(aggregateIterable);
when(aggregateIterable.batchSize(anyInt())).thenReturn(aggregateIterable);
@ -805,6 +809,52 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests { @@ -805,6 +809,52 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
verify(mapReduceIterable).collation(eq(com.mongodb.client.model.Collation.builder().locale("fr").build()));
}
@Test // DATAMONGO-2027
public void mapReduceShouldUseOutputCollectionWhenPresent() {
template.mapReduce("", "", "", MapReduceOptions.options().outputCollection("out-collection"),
AutogenerateableId.class);
verify(mapReduceIterable).collectionName(eq("out-collection"));
}
@Test // DATAMONGO-2027
public void mapReduceShouldNotUseOutputCollectionForInline() {
template.mapReduce("", "", "", MapReduceOptions.options().outputCollection("out-collection").outputTypeInline(),
AutogenerateableId.class);
verify(mapReduceIterable, never()).collectionName(any());
}
@Test // DATAMONGO-2027
public void mapReduceShouldUseOutputActionWhenPresent() {
template.mapReduce("", "", "", MapReduceOptions.options().outputCollection("out-collection").outputTypeMerge(),
AutogenerateableId.class);
verify(mapReduceIterable).action(eq(MapReduceAction.MERGE));
}
@Test // DATAMONGO-2027
public void mapReduceShouldUseOutputDatabaseWhenPresent() {
template.mapReduce("", "", "",
MapReduceOptions.options().outputDatabase("out-database").outputCollection("out-collection").outputTypeMerge(),
AutogenerateableId.class);
verify(mapReduceIterable).databaseName(eq("out-database"));
}
@Test // DATAMONGO-2027
public void mapReduceShouldNotUseOutputDatabaseForInline() {
template.mapReduce("", "", "", MapReduceOptions.options().outputDatabase("out-database").outputTypeInline(),
AutogenerateableId.class);
verify(mapReduceIterable, never()).databaseName(any());
}
@Test // DATAMONGO-1518
public void geoNearShouldUseCollationWhenPresent() {

312
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
Unescape View File

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
*/
package org.springframework.data.mongodb.core.mapreduce;
import static org.junit.Assert.*;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.*;
import static org.springframework.data.mongodb.core.query.Criteria.*;
@ -46,13 +46,14 @@ import com.mongodb.client.MongoCollection; @@ -46,13 +46,14 @@ import com.mongodb.client.MongoCollection;
* @author Mark Pollack
* @author Thomas Darimont
* @author Mark Paluch
* @author Christoph Strobl
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("classpath:infrastructure.xml")
public class MapReduceTests {
private String mapFunction = "function(){ for ( var i=0; i<this.x.length; i++ ){ emit( this.x[i] , 1 ); } }";
private String reduceFunction = "function(key,values){ var sum=0; for( var i=0; i<values.length; i++ ) sum += values[i]; return sum;}";
private static final String MAP_FUNCTION = "function(){ for ( var i=0; i<this.x.length; i++ ){ emit( this.x[i] , 1 ); } }";
private static final String REDUCE_FUNCTION = "function(key,values){ var sum=0; for( var i=0; i<values.length; i++ ) sum += values[i]; return sum;}";
@Autowired MongoTemplate template;
@Autowired MongoTemplate mongoTemplate;
@ -68,164 +69,116 @@ public class MapReduceTests { @@ -68,164 +69,116 @@ public class MapReduceTests {
}
protected void cleanDb() {
template.dropCollection(template.getCollectionName(ValueObject.class));
template.dropCollection("jmr2");
template.dropCollection("jmr2_out");
template.dropCollection("jmr1_out");
template.dropCollection("jmr1");
template.dropCollection("jmrWithGeo");
template.dropCollection("mapreduceout");
template.getMongoDbFactory().getDb("jmr1-out-db").drop();
}
@Test
@Test // DATADOC-7
@Ignore
public void testForDocs() {
createMapReduceData();
MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction,
MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
ValueObject.class);
for (ValueObject valueObject : results) {
System.out.println(valueObject);
}
}
@Test
@Test // DATAMONGO-260
public void testIssue260() {
createContentAndVersionData();
String map = "function () { emit(this.document_id, this.version); }";
String reduce = "function (key, values) { return Math.max.apply(Math, values); }";
MapReduceResults<ContentAndVersion> results = mongoTemplate.mapReduce("jmr2", map, reduce,
new MapReduceOptions().outputCollection("jmr2_out"), ContentAndVersion.class);
int size = 0;
assertThat(results).hasSize(3);
for (ContentAndVersion cv : results) {
if ("Resume".equals(cv.getId())) {
assertEquals(6, cv.getValue().longValue());
assertThat(cv.getValue().longValue()).isEqualTo(6);
}
if ("Schema".equals(cv.getId())) {
assertEquals(2, cv.getValue().longValue());
assertThat(cv.getValue().longValue()).isEqualTo(2);
}
if ("mongoDB How-To".equals(cv.getId())) {
assertEquals(2, cv.getValue().longValue());
assertThat(cv.getValue().longValue()).isEqualTo(2);
}
size++;
}
assertEquals(3, size);
}
@Test
@Test // DATAMONGO-260
public void testIssue260Part2() {
createNumberAndVersionData();
String map = "function () { emit(this.number, this.version); }";
String reduce = "function (key, values) { return Math.max.apply(Math, values); }";
MapReduceResults<NumberAndVersion> results = mongoTemplate.mapReduce("jmr2", map, reduce,
new MapReduceOptions().outputCollection("jmr2_out"), NumberAndVersion.class);
int size = 0;
for (NumberAndVersion nv : results) {
if ("1".equals(nv.getId())) {
assertEquals(2, nv.getValue().longValue());
assertThat(nv.getValue().longValue()).isEqualTo(2);
}
if ("2".equals(nv.getId())) {
assertEquals(6, nv.getValue().longValue());
assertThat(nv.getValue().longValue()).isEqualTo(6);
}
if ("3".equals(nv.getId())) {
assertEquals(2, nv.getValue().longValue());
assertThat(nv.getValue().longValue()).isEqualTo(2);
}
size++;
}
assertEquals(3, size);
}
private void createNumberAndVersionData() {
NumberAndVersion nv1 = new NumberAndVersion();
nv1.setNumber(1L);
nv1.setVersion(1L);
template.save(nv1, "jmr2");
NumberAndVersion nv2 = new NumberAndVersion();
nv2.setNumber(1L);
nv2.setVersion(2L);
template.save(nv2, "jmr2");
NumberAndVersion nv3 = new NumberAndVersion();
nv3.setNumber(2L);
nv3.setVersion(6L);
template.save(nv3, "jmr2");
NumberAndVersion nv4 = new NumberAndVersion();
nv4.setNumber(3L);
nv4.setVersion(1L);
template.save(nv4, "jmr2");
NumberAndVersion nv5 = new NumberAndVersion();
nv5.setNumber(3L);
nv5.setVersion(2L);
template.save(nv5, "jmr2");
assertThat(results).hasSize(3);
}
private void createContentAndVersionData() {
/*
{ "_id" : 1, "document_id" : "mongoDB How-To", "author" : "Amos King", "content" : "...", "version" : 1 }
{ "_id" : 2, "document_id" : "mongoDB How-To", "author" : "Amos King", "content" : "...", "version" : 1.1 }
{ "_id" : 3, "document_id" : "Resume", "author" : "Author", "content" : "...", "version" : 6 }
{ "_id" : 4, "document_id" : "Schema", "author" : "Someone Else", "content" : "...", "version" : 0.9 }
{ "_id" : 5, "document_id" : "Schema", "author" : "Someone Else", "content" : "...", "version" : 1 }
@Test // DATADOC-7, DATAMONGO-2027
public void testMapReduce() {
*/
ContentAndVersion cv1 = new ContentAndVersion();
cv1.setDocumentId("mongoDB How-To");
cv1.setAuthor("Amos King");
cv1.setContent("...");
cv1.setVersion(1L);
template.save(cv1, "jmr2");
performMapReduce(false, false);
ContentAndVersion cv2 = new ContentAndVersion();
cv2.setDocumentId("mongoDB How-To");
cv2.setAuthor("Amos King");
cv2.setContent("...");
cv2.setVersion(2L);
template.save(cv2, "jmr2");
List<ValueObject> results = mongoTemplate.find(new Query(), ValueObject.class, "jmr1_out");
assertMapReduceResults(copyToMap(results));
}
ContentAndVersion cv3 = new ContentAndVersion();
cv3.setDocumentId("Resume");
cv3.setAuthor("Author");
cv3.setContent("...");
cv3.setVersion(6L);
template.save(cv3, "jmr2");
@Test // DATADOC-7, DATAMONGO-2027
public void testMapReduceInline() {
ContentAndVersion cv4 = new ContentAndVersion();
cv4.setDocumentId("Schema");
cv4.setAuthor("Someone Else");
cv4.setContent("...");
cv4.setVersion(1L);
template.save(cv4, "jmr2");
performMapReduce(true, false);
assertThat(template.collectionExists("jmr1_out")).isFalse();
}
ContentAndVersion cv5 = new ContentAndVersion();
cv5.setDocumentId("Schema");
cv5.setAuthor("Someone Else");
cv5.setContent("...");
cv5.setVersion(2L);
template.save(cv5, "jmr2");
@Test // DATAMONGO-2027
public void mapReduceWithOutputDatabaseShouldWorkCorrectly() {
}
createMapReduceData();
@Test
public void testMapReduce() {
performMapReduce(false, false);
}
mongoTemplate.mapReduce("jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
options().outputDatabase("jmr1-out-db").outputCollection("jmr1-out"), ValueObject.class);
@Test
public void testMapReduceInline() {
performMapReduce(true, false);
assertThat(template.getMongoDbFactory().getDb("jmr1-out-db").listCollectionNames().into(new ArrayList<>()))
.contains("jmr1-out");
}
@Test
@Test // DATADOC-7
public void testMapReduceWithQuery() {
performMapReduce(false, true);
}
@Test
@Test // DATADOC-7
public void testMapReduceInlineWithScope() {
createMapReduceData();
Map<String, Object> scopeVariables = new HashMap<String, Object>();
@ -233,49 +186,30 @@ public class MapReduceTests { @@ -233,49 +186,30 @@ public class MapReduceTests {
String mapWithExcludeFunction = "function(){ for ( var i=0; i<this.x.length; i++ ){ if(this.x[i] != exclude) emit( this.x[i] , 1 ); } }";
MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", mapWithExcludeFunction, reduceFunction,
MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", mapWithExcludeFunction, REDUCE_FUNCTION,
new MapReduceOptions().scopeVariables(scopeVariables).outputTypeInline(), ValueObject.class);
Map<String, Float> m = copyToMap(results);
assertEquals(3, m.size());
assertEquals(2, m.get("b").intValue());
assertEquals(2, m.get("c").intValue());
assertEquals(1, m.get("d").intValue());
}
@Test // DATAMONGO-2027
public void shouldStoreResultInCollection() {
createMapReduceData();
String mapWithExcludeFunction = "function(){ for ( var i=0; i<this.x.length; i++ ){ emit( this.x[i] , 1 ); } }";
mongoTemplate.mapReduce("jmr1", mapWithExcludeFunction, reduceFunction,
new MapReduceOptions().outputCollection("mapreduceout"), ValueObject.class);
List<ValueObject> results = mongoTemplate.find(new Query(), ValueObject.class, "mapreduceout");
Map<String, Float> m = copyToMap(results);
assertEquals(4, m.size());
assertEquals(1, m.get("a").intValue());
assertEquals(2, m.get("b").intValue());
assertEquals(2, m.get("c").intValue());
assertEquals(1, m.get("d").intValue());
assertThat(copyToMap(results)) //
.hasSize(3) //
.containsEntry("b", 2F) //
.containsEntry("c", 2F) //
.containsEntry("d", 1F);
}
@Test
@Test // DATADOC-7
public void testMapReduceExcludeQuery() {
createMapReduceData();
Query query = new Query(where("x").ne(new String[] { "a", "b" }));
MapReduceResults<ValueObject> results = mongoTemplate.mapReduce(query, "jmr1", mapFunction, reduceFunction,
MapReduceResults<ValueObject> results = mongoTemplate.mapReduce(query, "jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
ValueObject.class);
Map<String, Float> m = copyToMap(results);
assertEquals(3, m.size());
assertEquals(1, m.get("b").intValue());
assertEquals(2, m.get("c").intValue());
assertEquals(1, m.get("d").intValue());
assertThat(copyToMap(results)) //
.hasSize(3) //
.containsEntry("b", 1F) //
.containsEntry("c", 2F) //
.containsEntry("d", 1F);
}
@Test // DATAMONGO-938
@ -283,24 +217,25 @@ public class MapReduceTests { @@ -283,24 +217,25 @@ public class MapReduceTests {
MongoCollection<Document> c = mongoTemplate.getDb().getCollection("jmrWithGeo", Document.class);
c.insertOne(new Document("x", Arrays.asList("a", "b")).append("loc", Arrays.<Double> asList(0D, 0D)));
c.insertOne(new Document("x", Arrays.asList("b", "c")).append("loc", Arrays.<Double> asList(0D, 0D)));
c.insertOne(new Document("x", Arrays.asList("c", "d")).append("loc", Arrays.<Double> asList(0D, 0D)));
c.insertOne(new Document("x", Arrays.asList("a", "b")).append("loc", Arrays.asList(0D, 0D)));
c.insertOne(new Document("x", Arrays.asList("b", "c")).append("loc", Arrays.asList(0D, 0D)));
c.insertOne(new Document("x", Arrays.asList("c", "d")).append("loc", Arrays.asList(0D, 0D)));
Query query = new Query(where("x").ne(new String[] { "a", "b" }).and("loc")
.within(new Box(new double[] { 0, 0 }, new double[] { 1, 1 })));
MapReduceResults<ValueObject> results = template.mapReduce(query, "jmrWithGeo", mapFunction, reduceFunction,
MapReduceResults<ValueObject> results = template.mapReduce(query, "jmrWithGeo", MAP_FUNCTION, REDUCE_FUNCTION,
ValueObject.class);
Map<String, Float> m = copyToMap(results);
assertEquals(3, m.size());
assertEquals(1, m.get("b").intValue());
assertEquals(2, m.get("c").intValue());
assertEquals(1, m.get("d").intValue());
assertThat(copyToMap(results)) //
.hasSize(3) //
.containsEntry("b", 1F) //
.containsEntry("c", 2F) //
.containsEntry("d", 1F);
}
private void performMapReduce(boolean inline, boolean withQuery) {
createMapReduceData();
MapReduceResults<ValueObject> results;
if (inline) {
@ -308,22 +243,23 @@ public class MapReduceTests { @@ -308,22 +243,23 @@ public class MapReduceTests {
results = mongoTemplate.mapReduce(new Query(), "jmr1", "classpath:map.js", "classpath:reduce.js",
ValueObject.class);
} else {
results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction, ValueObject.class);
results = mongoTemplate.mapReduce("jmr1", MAP_FUNCTION, REDUCE_FUNCTION, ValueObject.class);
}
} else {
if (withQuery) {
results = mongoTemplate.mapReduce(new Query(), "jmr1", mapFunction, reduceFunction,
results = mongoTemplate.mapReduce(new Query(), "jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
options().outputCollection("jmr1_out"), ValueObject.class);
} else {
results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction,
results = mongoTemplate.mapReduce("jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
new MapReduceOptions().outputCollection("jmr1_out"), ValueObject.class);
}
}
Map<String, Float> m = copyToMap(results);
assertMapReduceResults(m);
assertMapReduceResults(copyToMap(results));
}
private void createMapReduceData() {
MongoCollection<Document> c = mongoTemplate.getDb().getCollection("jmr1", Document.class);
c.insertOne(new Document("x", Arrays.asList("a", "b")));
c.insertOne(new Document("x", Arrays.asList("b", "c")));
@ -331,24 +267,100 @@ public class MapReduceTests { @@ -331,24 +267,100 @@ public class MapReduceTests {
}
private Map<String, Float> copyToMap(Iterable<ValueObject> results) {
List<ValueObject> valueObjects = new ArrayList<ValueObject>();
List<ValueObject> valueObjects = new ArrayList<>();
for (ValueObject valueObject : results) {
valueObjects.add(valueObject);
}
Map<String, Float> m = new HashMap<String, Float>();
Map<String, Float> m = new HashMap<>();
for (ValueObject vo : valueObjects) {
m.put(vo.getId(), vo.getValue());
}
return m;
}
private void assertMapReduceResults(Map<String, Float> m) {
assertEquals(4, m.size());
assertEquals(1, m.get("a").intValue());
assertEquals(2, m.get("b").intValue());
assertEquals(2, m.get("c").intValue());
assertEquals(1, m.get("d").intValue());
private void assertMapReduceResults(Map<String, Float> map) {
assertThat(map) //
.hasSize(4) //
.containsEntry("a", 1F) //
.containsEntry("b", 2F) //
.containsEntry("c", 2F) //
.containsEntry("d", 1F);
}
private void createNumberAndVersionData() {
NumberAndVersion nv1 = new NumberAndVersion();
nv1.setNumber(1L);
nv1.setVersion(1L);
template.save(nv1, "jmr2");
NumberAndVersion nv2 = new NumberAndVersion();
nv2.setNumber(1L);
nv2.setVersion(2L);
template.save(nv2, "jmr2");
NumberAndVersion nv3 = new NumberAndVersion();
nv3.setNumber(2L);
nv3.setVersion(6L);
template.save(nv3, "jmr2");
NumberAndVersion nv4 = new NumberAndVersion();
nv4.setNumber(3L);
nv4.setVersion(1L);
template.save(nv4, "jmr2");
NumberAndVersion nv5 = new NumberAndVersion();
nv5.setNumber(3L);
nv5.setVersion(2L);
template.save(nv5, "jmr2");
}
private void createContentAndVersionData() {
/*
{ "_id" : 1, "document_id" : "mongoDB How-To", "author" : "Amos King", "content" : "...", "version" : 1 }
{ "_id" : 2, "document_id" : "mongoDB How-To", "author" : "Amos King", "content" : "...", "version" : 1.1 }
{ "_id" : 3, "document_id" : "Resume", "author" : "Author", "content" : "...", "version" : 6 }
{ "_id" : 4, "document_id" : "Schema", "author" : "Someone Else", "content" : "...", "version" : 0.9 }
{ "_id" : 5, "document_id" : "Schema", "author" : "Someone Else", "content" : "...", "version" : 1 }
*/
ContentAndVersion cv1 = new ContentAndVersion();
cv1.setDocumentId("mongoDB How-To");
cv1.setAuthor("Amos King");
cv1.setContent("...");
cv1.setVersion(1L);
template.save(cv1, "jmr2");
ContentAndVersion cv2 = new ContentAndVersion();
cv2.setDocumentId("mongoDB How-To");
cv2.setAuthor("Amos King");
cv2.setContent("...");
cv2.setVersion(2L);
template.save(cv2, "jmr2");
ContentAndVersion cv3 = new ContentAndVersion();
cv3.setDocumentId("Resume");
cv3.setAuthor("Author");
cv3.setContent("...");
cv3.setVersion(6L);
template.save(cv3, "jmr2");
ContentAndVersion cv4 = new ContentAndVersion();
cv4.setDocumentId("Schema");
cv4.setAuthor("Someone Else");
cv4.setContent("...");
cv4.setVersion(1L);
template.save(cv4, "jmr2");
ContentAndVersion cv5 = new ContentAndVersion();
cv5.setDocumentId("Schema");
cv5.setAuthor("Someone Else");
cv5.setContent("...");
cv5.setVersion(2L);
template.save(cv5, "jmr2");
}
}

19
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ReactiveMapReduceTests.java
Unescape View File

@ -20,6 +20,8 @@ import static org.springframework.data.mongodb.core.query.Criteria.*; @@ -20,6 +20,8 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
import static org.springframework.data.mongodb.core.query.Query.*;
import lombok.Data;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.util.Arrays;
@ -62,7 +64,7 @@ public class ReactiveMapReduceTests { @@ -62,7 +64,7 @@ public class ReactiveMapReduceTests {
.create(template.dropCollection(ValueObject.class) //
.mergeWith(template.dropCollection("jmr1")) //
.mergeWith(template.dropCollection("jmr1_out")) //
.mergeWith(template.dropCollection("mapreduceout"))) //
.mergeWith(Mono.from(factory.getMongoDatabase("reactive-jrm1-out-db").drop()).then())) //
.verifyComplete();
}
@ -115,7 +117,7 @@ public class ReactiveMapReduceTests { @@ -115,7 +117,7 @@ public class ReactiveMapReduceTests {
.verifyComplete();
}
@Test // DATAMONGO-1890
@Test // DATAMONGO-1890, DATAMONGO-2027
public void mapReduceWithOutputCollection() {
createMapReduceData();
@ -131,7 +133,20 @@ public class ReactiveMapReduceTests { @@ -131,7 +133,20 @@ public class ReactiveMapReduceTests {
new ValueObject("c", 2), new ValueObject("d", 1));
}) //
.verifyComplete();
}
@Test // DATAMONGO-2027
public void mapReduceWithOutputDatabase() {
createMapReduceData();
StepVerifier
.create(template.mapReduce(new Query(), ValueObject.class, "jmr1", ValueObject.class, mapFunction,
reduceFunction, MapReduceOptions.options().outputDatabase("reactive-jrm1-out-db").outputCollection("jmr1_out")))
.expectNextCount(4).verifyComplete();
Flux.from(factory.getMongoDatabase("reactive-jrm1-out-db").listCollectionNames()).buffer(10)
.map(list -> list.contains("jmr1_out")).as(StepVerifier::create).expectNext(true).verifyComplete();
}
@Test // DATAMONGO-1890

Write Preview
Loading…
Cancel
Save