JAVA-1125 Change way remove(query) on gridfs is performed to improve performances

build.properties

@@ -18,10 +18,10 @@ javac.source=1.5
 
 # IMPORTANT: MAKE SURE YOU CHANGE BOTH lib.version AND lib.version.osi.compat, ACCORDING TO THIS PATTERN
 # lib.version=2.8.0-SNAPSHOT  ==> lib.version.osgi.compat=2.8.0.BUILD-SNAPSHOT
-# lib.version=2.8.0-RC1  ==> lib.version.osgi.compat=2.8.0.RC1
-# lib.version=2.8.0  ==> lib.version.osgi.compat=2.8.0.RELEASE
-lib.version=2.12.0-SNAPSHOT
-lib.version.osgi.compat=2.12.0.BUILD-SNAPSHOT
+# lib.version=2.8.0-rc1       ==> lib.version.osgi.compat=2.8.0.RC1
+# lib.version=2.8.0           ==> lib.version.osgi.compat=2.8.0.RELEASE
+lib.version=2.12.0
+lib.version.osgi.compat=2.12.0.RELEASE
 
 compatibility.baseline.version=2.11.0
 url.libbase=http://driver-downloads.mongodb.org/java

config/codenarc/codenarc.xml

@@ -56,7 +56,7 @@
     <ruleset-ref path='rulesets/generic.xml'/>
     <ruleset-ref path='rulesets/groovyism.xml'>
         <exclude name="ExplicitCallToCompareToMethod"/>
-     </ruleset-ref>
+    </ruleset-ref>
     <ruleset-ref path='rulesets/junit.xml'/>
     <ruleset-ref path='rulesets/logging.xml'/>
     <ruleset-ref path='rulesets/naming.xml'>
@@ -65,10 +65,13 @@
     <ruleset-ref path='rulesets/security.xml'/>
     <ruleset-ref path='rulesets/serialization.xml'/>
     <ruleset-ref path='rulesets/size.xml'>
+        <rule-config name='MethodCount'>
+            <property name='maxMethods' value='50'/>
+        </rule-config>
         <exclude name='CrapMetric'/>
     </ruleset-ref>
     <ruleset-ref path='rulesets/unnecessary.xml'>
-        <!-- these should be revisted later when we've developed a Groovy style -->
+        <!-- these should be revisited later when we've developed a Groovy style -->
         <exclude name='UnnecessaryGetter'/>
         <exclude name='UnnecessarySemicolon'/>
     </ruleset-ref>

pom.xml

@@ -8,7 +8,7 @@ driver developers who would rather use Maven than Ant as their build tool.
     <artifactId>mongo-java-driver</artifactId>
     <packaging>bundle</packaging>
     <name>MongoDB Java Driver</name>
-    <version>2.12.0-SNAPSHOT</version>
+    <version>2.12.0</version>
     <description>The MongoDB Java driver</description>
     <url>http://www.mongodb.org</url>
 

src/main/META-INF/MANIFEST.MF

@@ -4,7 +4,13 @@ Bundle-ManifestVersion: 2
 Bundle-Name: MongoDB Java Driver
 Bundle-SymbolicName: org.mongodb.mongo-java-driver
 Bundle-Version: @VERSION@
-Import-Package: javax.management, javax.net, javax.net.ssl
+Import-Package: javax.management,
+ javax.net,
+ javax.net.ssl,
+ javax.security.sasl,
+ javax.security.auth.login,
+ javax.security.auth,
+ org.ietf.jgss
 Export-Package: com.mongodb;version="@VERSION@",
  com.mongodb.io;version="@VERSION@",
  com.mongodb.util;version="@VERSION@",

src/main/com/mongodb/AcknowledgedBulkWriteResult.java

@@ -25,11 +25,11 @@ class AcknowledgedBulkWriteResult extends BulkWriteResult {
     private int insertedCount;
     private int matchedCount;
     private int removedCount;
-    private int modifiedCount;
+    private Integer modifiedCount;
     private final List<BulkWriteUpsert> upserts;
 
     AcknowledgedBulkWriteResult(final int insertedCount, final int matchedCount, final int removedCount,
-                                final int modifiedCount, final List<BulkWriteUpsert> upserts) {
+                                final Integer modifiedCount, final List<BulkWriteUpsert> upserts) {
         this.insertedCount = insertedCount;
         this.matchedCount = matchedCount;
         this.removedCount = removedCount;
@@ -41,7 +41,7 @@ class AcknowledgedBulkWriteResult extends BulkWriteResult {
         this(type, count, 0, upserts);
     }
 
-    AcknowledgedBulkWriteResult(final WriteRequest.Type type, final int count, final int modifiedCount,
+    AcknowledgedBulkWriteResult(final WriteRequest.Type type, final int count, final Integer modifiedCount,
                                 final List<BulkWriteUpsert> upserts) {
         this(type == WriteRequest.Type.INSERT ? count : 0,
              (type == WriteRequest.Type.UPDATE || type == WriteRequest.Type.REPLACE)  ? count : 0,
@@ -69,9 +69,20 @@ public int getRemovedCount() {
         return removedCount;
     }
 
+    @Override
+    public boolean isModifiedCountAvailable() {
+        return modifiedCount != null;
+    }
+
     @Override
     public int getModifiedCount() {
+        if (modifiedCount == null) {
+            throw new UnsupportedOperationException("The modifiedCount is not available because at least one of the servers that was " +
+                                                    "updated was not able to provide this information (the server is must be at least " +
+                                                    "version 2.6");
+        }
         return modifiedCount;
+
     }
 
     @Override
@@ -93,13 +104,13 @@ public boolean equals(final Object o) {
         if (insertedCount != that.insertedCount) {
             return false;
         }
-        if (modifiedCount != that.modifiedCount) {
+        if (matchedCount != that.matchedCount) {
             return false;
         }
         if (removedCount != that.removedCount) {
             return false;
         }
-        if (matchedCount != that.matchedCount) {
+        if (modifiedCount != null ? !modifiedCount.equals(that.modifiedCount) : that.modifiedCount != null) {
             return false;
         }
         if (!upserts.equals(that.upserts)) {
@@ -111,11 +122,11 @@ public boolean equals(final Object o) {
 
     @Override
     public int hashCode() {
-        int result = upserts.hashCode();
-        result = 31 * result + insertedCount;
+        int result = insertedCount;
         result = 31 * result + matchedCount;
         result = 31 * result + removedCount;
-        result = 31 * result + modifiedCount;
+        result = 31 * result + (modifiedCount != null ? modifiedCount.hashCode() : 0);
+        result = 31 * result + upserts.hashCode();
         return result;
     }
 

src/main/com/mongodb/AggregationOutput.java

@@ -16,54 +16,66 @@
 
 package com.mongodb;
 
+@SuppressWarnings("deprecation")
 public class AggregationOutput {
 
     /**
      * returns an iterator to the results of the aggregation
-     * @return
+     * @return the results of the aggregation
      */
     public Iterable<DBObject> results() {
         return _resultSet;
     }
 
     /**
      * returns the command result of the aggregation
-     * @return
+     * @return the command result
+     *
+     * @deprecated there is no replacement for this method
      */
+    @Deprecated
     public CommandResult getCommandResult(){
         return _commandResult;
     }
 
     /**
      * returns the original aggregation command
-     * @return
+     * @return the command
+     *
+     * @deprecated there is no replacement for this method
      */
+    @Deprecated
     public DBObject getCommand() {
         return _cmd;
     }
 
     /**
      * returns the address of the server used to execute the aggregation
-     * @return
+     * @return the server which executed the aggregation
+     *
+     * @deprecated there is no replacement for this method
      */
+    @Deprecated
     public ServerAddress getServerUsed() {
         return _commandResult.getServerUsed();
     }
 
     /**
-     * string representation of the aggregation command
+     * Constructs a new instance
+     *
+     * @param command the aggregation command
+     * @param commandResult the aggregation command result
+     *
+     * @deprecated there is no replacement for this constructor
      */
-    public String toString(){
-        return _commandResult.toString();
-    }
-
     @SuppressWarnings("unchecked")
-    public AggregationOutput(DBObject cmd, CommandResult raw) {
-        _commandResult = raw;
-        _cmd = cmd;
+    @Deprecated
+    public AggregationOutput(DBObject command, CommandResult commandResult) {
+        _commandResult = commandResult;
+        _cmd = command;
 
-        if(raw.containsField("result"))
-            _resultSet = (Iterable<DBObject>) raw.get( "result" );
+        if(commandResult.containsField("result"))
+            _resultSet = (Iterable<DBObject>) commandResult.get( "result" );
         else 
             throw new IllegalArgumentException("result undefined");
     }

src/main/com/mongodb/AnyServerSelector.java

@@ -0,0 +1,15 @@
+package com.mongodb;
+
+import java.util.List;
+
+class AnyServerSelector implements ServerSelector {
+    @Override
+    public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
+        return clusterDescription.getAny();
+    }
+
+    @Override
+    public String toString() {
+        return "AnyServerSelector{}";
+    }
+}

src/main/com/mongodb/BaseCluster.java

@@ -25,6 +25,7 @@
 import java.util.logging.Logger;
 
 import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static org.bson.util.Assertions.isTrue;
 import static org.bson.util.Assertions.notNull;
@@ -76,27 +77,24 @@ public Server getServer(final ServerSelector serverSelector, final long maxWaitT
                 }
 
                 if (!curDescription.isConnecting()) {
-                    throw new MongoServerSelectionException(
-                                                                  format("Unable to connect to any server that satisfies the selector " +
-                                                                         "%s", serverSelector));
+                    throw new MongoServerSelectionException(format("Unable to connect to any server that matches %s", serverSelector));
                 }
 
                 final long timeout = endTime - System.nanoTime();
 
                 LOGGER.info(format("No server chosen by %s from cluster description %s. Waiting for %d ms before timing out",
-                                   serverSelector, curDescription, TimeUnit.MILLISECONDS.convert(timeout, NANOSECONDS)));
+                                   serverSelector, curDescription, MILLISECONDS.convert(timeout, NANOSECONDS)));
 
                 if (!currentPhase.await(timeout, NANOSECONDS)) {
-                    throw new MongoTimeoutException(format("Timed out while waiting for a server that satisfies the selector: %s "
-                                                           + "after  %d %s", serverSelector, timeout, NANOSECONDS));
+                    throw new MongoTimeoutException(format("Timed out while waiting for a server that matches %s after %d ms",
+                                                           serverSelector, MILLISECONDS.convert(timeout, NANOSECONDS)));
                 }
                 currentPhase = phase.get();
                 curDescription = description;
                 serverDescriptions = serverSelector.choose(curDescription);
             }
         } catch (InterruptedException e) {
-            throw new MongoInterruptedException(format("Interrupted while waiting for a server that satisfies server selector %s ",
-                                                       serverSelector), e);
+            throw new MongoInterruptedException(format("Interrupted while waiting for a server that matches %s ", serverSelector), e);
         }
     }
 
@@ -117,18 +115,18 @@ public ClusterDescription getDescription(final long maxWaitTime, final TimeUnit
                 final long timeout = endTime - System.nanoTime();
 
                 LOGGER.info(format("Cluster description not yet available. Waiting for %d ms before timing out",
-                                   TimeUnit.MILLISECONDS.convert(timeout, NANOSECONDS)));
+                                   MILLISECONDS.convert(timeout, NANOSECONDS)));
 
                 if (!currentPhase.await(timeout, NANOSECONDS)) {
-                    throw new MongoTimeoutException(format("Timed out while waiting for the cluster description after waiting %d %s",
-                                                           timeout, NANOSECONDS));
+                    throw new MongoTimeoutException(format("Timed out while waiting to connect after %d ms",
+                                                           MILLISECONDS.convert(timeout, NANOSECONDS)));
                 }
                 currentPhase = phase.get();
                 curDescription = description;
             }
             return curDescription;
         } catch (InterruptedException e) {
-            throw new MongoInterruptedException(format("Interrupted while waiting for the cluster description"), e);
+            throw new MongoInterruptedException(format("Interrupted while waiting to connect"), e);
         }
     }
 

src/main/com/mongodb/BaseWriteCommandMessage.java

@@ -87,9 +87,19 @@ private void writeCommandHeader(final OutputBuffer buffer) {
     protected abstract BaseWriteCommandMessage writeTheWrites(final OutputBuffer buffer, final int commandStartPosition,
                                                               final BSONBinaryWriter writer);
 
-    protected boolean maximumCommandDocumentSizeExceeded(final OutputBuffer buffer, final int commandStartPosition) {
-        // Subtract 2 to account for the trailing 0x0 at the end of the enclosing array and command document
-        return buffer.getPosition() - commandStartPosition > getSettings().getMaxDocumentSize() + HEADROOM - 2;
+    protected boolean exceedsLimits(final int batchLength, final int batchItemCount) {
+        return (exceedsBatchLengthLimit(batchLength, batchItemCount) || exceedsBatchItemCountLimit(batchItemCount));
+    }
+
+    // make a special exception for a command with only a single item added to it.  It's allowed to exceed maximum document size so that
+    // it's possible to, say, send a replacement document that is itself 16MB, which would push the size of the containing command
+    // document to be greater than the maximum document size.
+    private boolean exceedsBatchLengthLimit(final int batchLength, final int batchItemCount) {
+        return batchLength > getSettings().getMaxDocumentSize() && batchItemCount > 1;
+    }
+
+    private boolean exceedsBatchItemCountLimit(final int batchItemCount) {
+        return batchItemCount > getSettings().getMaxWriteBatchSize();
     }
 
     public abstract int getItemCount();

src/main/com/mongodb/BulkWriteBatchCombiner.java

@@ -33,7 +33,7 @@ class BulkWriteBatchCombiner {
     private int insertedCount;
     private int matchedCount;
     private int removedCount;
-    private int modifiedCount;
+    private Integer modifiedCount = 0;
     private final Set<BulkWriteUpsert> writeUpserts = new TreeSet<BulkWriteUpsert>(new Comparator<BulkWriteUpsert>() {
         @Override
         public int compare(final BulkWriteUpsert o1, final BulkWriteUpsert o2) {
@@ -58,7 +58,11 @@ public void addResult(final BulkWriteResult result, final IndexMap indexMap) {
         insertedCount += result.getInsertedCount();
         matchedCount += result.getMatchedCount();
         removedCount += result.getRemovedCount();
-        modifiedCount += result.getModifiedCount();
+        if (result.isModifiedCountAvailable() && modifiedCount != null) {
+            modifiedCount += result.getModifiedCount();
+        } else {
+            modifiedCount = null;
+        }
         mergeUpserts(result.getUpserts(), indexMap);
     }
 

src/main/com/mongodb/BulkWriteError.java

@@ -115,4 +115,14 @@ public int hashCode() {
         result = 31 * result + details.hashCode();
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "BulkWriteError{"
+               + "index=" + index
+               + ", code=" + code
+               + ", message='" + message + '\''
+               + ", details=" + details
+               + '}';
+    }
 }

src/main/com/mongodb/BulkWriteResult.java

@@ -65,15 +65,34 @@ public abstract class BulkWriteResult {
      */
     public abstract int getRemovedCount();
 
+    /**
+     * Returns true if the server was able to provide a count of modified documents.  If this method returns false (which can happen if
+     * the server is not at least version 2.6) then the {@code getModifiedCount} method will throw {@code UnsupportedOperationException}.
+     *
+     * @return true if modifiedCount is available
+     *
+     * @throws UnacknowledgedWriteException if the write was unacknowledged.
+     * @see WriteConcern#UNACKNOWLEDGED
+     * @see #getModifiedCount()
+     */
+    public abstract boolean isModifiedCountAvailable();
+
     /**
      * Returns the number of documents modified by updates or replacements in the write operation.  This will only count documents that
      * were actually changed; for example, if you set the value of some field, and the field already has that value,
      * that will not count as a modification.
+     * <p>
+     *     If the server is not able to provide a count of modified documents (which can happen if the server is not at least version
+     *     2.6), then this method will throw an {@code UnsupportedOperationException}
+     * </p>
      *
      * @return the number of documents modified by the write operation
      *
      * @throws UnacknowledgedWriteException if the write was unacknowledged.
+     * @throws java.lang.UnsupportedOperationException if no modified count is available
      * @see WriteConcern#UNACKNOWLEDGED
+     * @see #isModifiedCountAvailable()
+     * @mongodb.server.release 2.6
      */
     public abstract int getModifiedCount();