DATAMONGO-260 - MapReduce fails when using with Long as key-type.

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ContentAndVersion.java

@@ -0,0 +1,73 @@
+package org.springframework.data.mongodb.core.mapreduce;
+
+public class ContentAndVersion {
+
+	private String id;
+	
+	private String document_id;
+	
+	private String content;
+	
+	private String author;
+
+	private Long version;
+	
+	private Long value;
+	
+	public String getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+
+	public String getDocumentId() {
+		return document_id;
+	}
+
+	public Long getValue() {
+		return value;
+	}
+
+	public void setValue(Long value) {
+		this.value = value;
+	}
+
+	public void setDocumentId(String documentId) {
+		this.document_id = documentId;
+	}
+
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public Long getVersion() {
+		return version;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+	@Override
+	public String toString() {
+		return "ContentAndVersion [id=" + id + ", document_id=" + document_id + ", content=" + content + ", author="
+				+ author + ", version=" + version + ", value=" + value + "]";
+	}
+	
+
+}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java

@@ -60,7 +60,7 @@ public class MapReduceTests {
 	MongoTemplate template;
 	@Autowired
 	MongoDbFactory factory;
-	
+
 	MongoTemplate mongoTemplate;
 
 	@Autowired
@@ -88,6 +88,8 @@ 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");
 	}
@@ -96,11 +98,134 @@ public class MapReduceTests {
 	@Ignore
 	public void testForDocs() {
 		createMapReduceData();
-		MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction, ValueObject.class);
+		MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction,
+				ValueObject.class);
 		for (ValueObject valueObject : results) {
 			System.out.println(valueObject);
 		}
 	}
+
+	@Test
+	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;
+		for (ContentAndVersion cv : results) {
+			if (cv.getId().equals("Resume"))  { 
+				assertEquals(6, cv.getValue().longValue());
+			}
+			if (cv.getId().equals("Schema")) {
+				assertEquals(2, cv.getValue().longValue());
+			}
+			if (cv.getId().equals("mongoDB How-To")) {
+				assertEquals(2, cv.getValue().longValue());
+			}
+			size++;
+		}
+		assertEquals(3,size);
+	}
+
+	@Test
+	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 (nv.getId().equals("1"))  { 
+				assertEquals(2, nv.getValue().longValue());
+			}
+			if (nv.getId().equals("2")) {
+				assertEquals(6, nv.getValue().longValue());
+			}
+			if (nv.getId().equals("3")) {
+				assertEquals(2, nv.getValue().longValue());
+			}
+			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");
+
+	}
+
+	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");
+
+	}
+
 	@Test
 	public void testMapReduce() {
 		performMapReduce(false, false);
@@ -110,7 +235,7 @@ public class MapReduceTests {
 	public void testMapReduceInline() {
 		performMapReduce(true, false);
 	}
-	
+
 	@Test
 	public void testMapReduceWithQuery() {
 		performMapReduce(false, true);
@@ -122,9 +247,9 @@ public class MapReduceTests {
 
 		Map<String, Object> scopeVariables = new HashMap<String, Object>();
 		scopeVariables.put("exclude", "a");
-		
-		String mapWithExcludeFunction =  "function(){ for ( var i=0; i<this.x.length; i++ ){ if(this.x[i] != exclude) emit( this.x[i] , 1 ); } }";
-	
+
+		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,
 				new MapReduceOptions().scopeVariables(scopeVariables).outputTypeInline(), ValueObject.class);
 		Map<String, Float> m = copyToMap(results);
@@ -133,37 +258,40 @@ public class MapReduceTests {
 		assertEquals(2, m.get("c").intValue());
 		assertEquals(1, m.get("d").intValue());
 	}
-	
-	@Test 
+
+	@Test
 	public void testMapReduceExcludeQuery() {
 		createMapReduceData();
-		
+
 		Query query = new Query(where("x").ne(new String[] { "a", "b" }));
-		MapReduceResults<ValueObject> results = mongoTemplate.mapReduce(query, "jmr1", mapFunction, reduceFunction, ValueObject.class);
-		
+		MapReduceResults<ValueObject> results = mongoTemplate.mapReduce(query, "jmr1", mapFunction, reduceFunction,
+				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());
-		
+
 	}
-	
 
 	private void performMapReduce(boolean inline, boolean withQuery) {
 		createMapReduceData();
 		MapReduceResults<ValueObject> results;
 		if (inline) {
 			if (withQuery) {
-				results = mongoTemplate.mapReduce(new Query(), "jmr1", "classpath:map.js", "classpath:reduce.js", ValueObject.class);
+				results = mongoTemplate.mapReduce(new Query(), "jmr1", "classpath:map.js", "classpath:reduce.js",
+						ValueObject.class);
 			} else {
 				results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction, ValueObject.class);
 			}
 		} else {
 			if (withQuery) {
-				results = mongoTemplate.mapReduce(new Query(), "jmr1", mapFunction, reduceFunction, options().outputCollection("jmr1_out"), ValueObject.class);
+				results = mongoTemplate.mapReduce(new Query(), "jmr1", mapFunction, reduceFunction,
+						options().outputCollection("jmr1_out"), ValueObject.class);
 			} else {
-				results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction, new MapReduceOptions().outputCollection("jmr1_out"), ValueObject.class);
+				results = mongoTemplate.mapReduce("jmr1", mapFunction, reduceFunction,
+						new MapReduceOptions().outputCollection("jmr1_out"), ValueObject.class);
 			}
 		}
 		Map<String, Float> m = copyToMap(results);

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/NumberAndVersion.java

@@ -0,0 +1,40 @@
+package org.springframework.data.mongodb.core.mapreduce;
+
+public class NumberAndVersion {
+
+	private String id;
+	private Long number;
+	private Long version;
+	private Long value;
+	
+	public Long getValue() {
+		return value;
+	}
+	public void setValue(Long value) {
+		this.value = value;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public Long getNumber() {
+		return number;
+	}
+	public void setNumber(Long number) {
+		this.number = number;
+	}
+	public Long getVersion() {
+		return version;
+	}
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+	@Override
+	public String toString() {
+		return "NumberAndVersion [id=" + id + ", number=" + number + ", version=" + version + ", value=" + value + "]";
+	}
+
+	
+}