Issue/datamongo 957

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>1.6.0.BUILD-SNAPSHOT</version>
+	<version>1.6.0.DATAMONGO-957-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>

spring-data-mongodb-cross-store/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-957-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.6.0.BUILD-SNAPSHOT</version>
+			<version>1.6.0.DATAMONGO-957-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

spring-data-mongodb-distribution/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-957-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-log4j/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-957-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>1.6.0.BUILD-SNAPSHOT</version>
+		<version>1.6.0.DATAMONGO-957-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java

@@ -2030,6 +2030,7 @@ public FindCallback(DBObject query, DBObject fields) {
 		}
 
 		public DBCursor doInCollection(DBCollection collection) throws MongoException, DataAccessException {
+
 			if (fields == null || fields.toMap().isEmpty()) {
 				return collection.find(query);
 			} else {
@@ -2185,11 +2186,11 @@ public DBCursor prepare(DBCursor cursor) {
 			}
 
 			if (query.getSkip() <= 0 && query.getLimit() <= 0 && query.getSortObject() == null
-					&& !StringUtils.hasText(query.getHint())) {
+					&& !StringUtils.hasText(query.getHint()) && !query.getMeta().hasValues()) {
 				return cursor;
 			}
 
-			DBCursor cursorToUse = cursor;
+			DBCursor cursorToUse = cursor.copy();
 
 			try {
 				if (query.getSkip() > 0) {
@@ -2205,6 +2206,12 @@ public DBCursor prepare(DBCursor cursor) {
 				if (StringUtils.hasText(query.getHint())) {
 					cursorToUse = cursorToUse.hint(query.getHint());
 				}
+				if (query.getMeta().hasValues()) {
+					for (Entry<String, Object> entry : query.getMeta().values()) {
+						cursorToUse = cursorToUse.addSpecial(entry.getKey(), entry.getValue());
+					}
+				}
+
 			} catch (RuntimeException e) {
 				throw potentiallyConvertRuntimeException(e);
 			}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java

@@ -0,0 +1,193 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.query;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Meta-data for {@link Query} instances.
+ * 
+ * @author Christoph Strobl
+ * @author Oliver Gierke
+ * @since 1.6
+ */
+public class Meta {
+
+	private enum MetaKey {
+		MAX_TIME_MS("$maxTimeMS"), MAX_SCAN("$maxScan"), COMMENT("$comment"), SNAPSHOT("$snapshot");
+
+		private String key;
+
+		private MetaKey(String key) {
+			this.key = key;
+		}
+	}
+
+	private final Map<String, Object> values = new LinkedHashMap<String, Object>(2);
+
+	/**
+	 * @return {@literal null} if not set.
+	 */
+	public Long getMaxTimeMsec() {
+		return getValue(MetaKey.MAX_TIME_MS.key);
+	}
+
+	/**
+	 * Set the maximum time limit in milliseconds for processing operations.
+	 * 
+	 * @param maxTimeMsec
+	 */
+	public void setMaxTimeMsec(long maxTimeMsec) {
+		setMaxTime(maxTimeMsec, TimeUnit.MILLISECONDS);
+	}
+
+	/**
+	 * Set the maximum time limit for processing operations.
+	 * 
+	 * @param timeout
+	 * @param timeUnit
+	 */
+	public void setMaxTime(long timeout, TimeUnit timeUnit) {
+		setValue(MetaKey.MAX_TIME_MS.key, (timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS).toMillis(timeout));
+	}
+
+	/**
+	 * @return {@literal null} if not set.
+	 */
+	public Long getMaxScan() {
+		return getValue(MetaKey.MAX_SCAN.key);
+	}
+
+	/**
+	 * Only scan the specified number of documents.
+	 * 
+	 * @param maxScan
+	 */
+	public void setMaxScan(long maxScan) {
+		setValue(MetaKey.MAX_SCAN.key, maxScan);
+	}
+
+	/**
+	 * Add a comment to the query.
+	 * 
+	 * @param comment
+	 */
+	public void setComment(String comment) {
+		setValue(MetaKey.COMMENT.key, comment);
+	}
+
+	/**
+	 * @return {@literal null} if not set.
+	 */
+	public String getComment() {
+		return getValue(MetaKey.COMMENT.key);
+	}
+
+	/**
+	 * Using snapshot prevents the cursor from returning a document more than once.
+	 * 
+	 * @param useSnapshot
+	 */
+	public void setSnapshot(boolean useSnapshot) {
+		setValue(MetaKey.SNAPSHOT.key, useSnapshot);
+	}
+
+	/**
+	 * @return {@literal null} if not set.
+	 */
+	public boolean getSnapshot() {
+		return getValue(MetaKey.SNAPSHOT.key, false);
+	}
+
+	/**
+	 * @return
+	 */
+	public boolean hasValues() {
+		return !this.values.isEmpty();
+	}
+
+	/**
+	 * Get {@link Iterable} of set meta values.
+	 * 
+	 * @return
+	 */
+	public Iterable<Entry<String, Object>> values() {
+		return Collections.unmodifiableSet(this.values.entrySet());
+	}
+
+	/**
+	 * Sets or removes the value in case of {@literal null} or empty {@link String}.
+	 * 
+	 * @param key must not be {@literal null} or empty.
+	 * @param value
+	 */
+	private void setValue(String key, Object value) {
+
+		Assert.hasText(key, "Meta key must not be 'null' or blank.");
+
+		if (value == null || (value instanceof String && !StringUtils.hasText((String) value))) {
+			this.values.remove(key);
+		}
+		this.values.put(key, value);
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T> T getValue(String key) {
+		return (T) this.values.get(key);
+	}
+
+	private <T> T getValue(String key, T defaultValue) {
+
+		T value = getValue(key);
+		return value != null ? value : defaultValue;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(this.values);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (!(obj instanceof Meta)) {
+			return false;
+		}
+
+		Meta other = (Meta) obj;
+		return ObjectUtils.nullSafeEquals(this.values, other.values);
+	}
+}