JAVA-1128: Don't apply key checking for inserts into system.indexes. Ensure that key checking and _id creation occurs for all insert paths

Author: jyemin

src/main/com/mongodb/DBCollectionImpl.java

@@ -173,29 +173,18 @@ protected WriteResult insert(List<DBObject> list, boolean shouldApply , WriteCon
             }
         }
 
-        if ( shouldApply ){
-            for (DBObject o : list) {
-                apply(o);
-                _checkObject(o, false, false);
-                Object id = o.get("_id");
-                if (id instanceof ObjectId) {
-                    ((ObjectId) id).notNew();
-                }
-            }
-        }
-
         DBPort port = db.getConnector().getPrimaryPort();
         try {
             if (useWriteCommands(concern, port)) {
                 try {
-                    return translateBulkWriteResult(insertWithCommandProtocol(list, concern, encoder, port), INSERT, concern,
+                    return translateBulkWriteResult(insertWithCommandProtocol(list, concern, encoder, port, shouldApply), INSERT, concern,
                                                     port.getAddress());
                 } catch (BulkWriteException e) {
                     throw translateBulkWriteException(e, INSERT);
                 }
             }
             else {
-                return insertWithWriteProtocol(list, concern, encoder, port);
+                return insertWithWriteProtocol(list, concern, encoder, port, shouldApply);
             }
         } finally {
             db.getConnector().releasePort(port);
@@ -365,7 +354,7 @@ public void createIndex(final DBObject keys, final DBObject options, DBEncoder e
                 }
             } else {
                 db.doGetCollection("system.indexes").insertWithWriteProtocol(asList(index), WriteConcern.SAFE,
-                                                                             DefaultDBEncoder.FACTORY.create(), port);
+                                                                             DefaultDBEncoder.FACTORY.create(), port, false);
             }
         } catch (IOException e) {
             throw new MongoException.Network("Operation on server " + port.getAddress() + " failed", e);
@@ -376,9 +365,9 @@ public void createIndex(final DBObject keys, final DBObject options, DBEncoder e
 
     private BulkWriteResult insertWithCommandProtocol(final List<DBObject> list, final WriteConcern writeConcern,
                                                       final DBEncoder encoder,
-                                                      final DBPort port) {
-        for (DBObject o : list) {
-            _checkObject(o, false, false);
+                                                      final DBPort port, final boolean shouldApply) {
+        if ( shouldApply ){
+            applyRulesForInsert(list);
         }
 
         BaseWriteCommandMessage message = new InsertCommandMessage(getNamespace(), writeConcern, list,
@@ -387,6 +376,17 @@ private BulkWriteResult insertWithCommandProtocol(final List<DBObject> list, fin
         return writeWithCommandProtocol(port, INSERT, message, writeConcern);
     }
 
+    private void applyRulesForInsert(final List<DBObject> list) {
+        for (DBObject o : list) {
+            _checkObject(o, false, false);
+            apply(o);
+            Object id = o.get("_id");
+            if (id instanceof ObjectId) {
+                ((ObjectId) id).notNew();
+            }
+        }
+    }
+
     private BulkWriteResult removeWithCommandProtocol(final List<RemoveRequest> removeList,
                                                       final WriteConcern writeConcern,
                                                       final DBEncoder encoder, final DBPort port) {
@@ -486,9 +486,9 @@ public CommandResult execute() throws IOException {
 
 
     private WriteResult insertWithWriteProtocol(final List<DBObject> list, final WriteConcern concern, final DBEncoder encoder,
-                                                final DBPort port) {
-        for (DBObject o : list) {
-            _checkObject(o, false, false);
+                                                final DBPort port, final boolean shouldApply) {
+        if ( shouldApply ){
+            applyRulesForInsert(list);
         }
 
         WriteResult last = null;
@@ -792,7 +792,7 @@ BulkWriteResult executeWriteCommandProtocol() {
                     for (InsertRequest cur : insertRequests) {
                         documents.add(cur.getDocument());
                     }
-                    return insertWithCommandProtocol(documents, writeConcern, encoder, port);
+                    return insertWithCommandProtocol(documents, writeConcern, encoder, port, true);
                 }
 
                 @Override

src/test/com/mongodb/BulkWriteOperationSpecification.groovy

@@ -78,6 +78,24 @@ class BulkWriteOperationSpecification extends FunctionalSpecification {
         ordered << [true, false]
     }
 
+    def 'when a document with no _id  is inserted, the _id should be generated by the driver'() {
+        given:
+        def operation = initializeBulkOperation(ordered)
+        def document = new BasicDBObject()
+        operation.insert(document)
+
+        when:
+        def result = operation.execute()
+
+        then:
+        result == new AcknowledgedBulkWriteResult(INSERT, 1, [])
+        document._id instanceof ObjectId
+        collection.findOne() == document
+
+        where:
+        ordered << [true, false]
+    }
+
     def 'when documents match the query, a remove of one should remove one of them'() {
         given:
         collection.insert(new BasicDBObject('x', true))