CSHARP-693: InsertBatch must call GLE after all sub-batches even if WriteConcern is Unacknowledged but ContinueOnError is false.

Author: rstam

MongoDB.Driver/MongoCollection.cs

@@ -1177,8 +1177,25 @@ public virtual IEnumerable<WriteConcernResult> InsertBatch(
                         if (message.MessageLength > connection.ServerInstance.MaxMessageLength)
                         {
                             byte[] lastDocument = message.RemoveLastDocument(bsonBuffer);
-                            var intermediateResult = connection.SendMessage(bsonBuffer, message, writeConcern, _database.Name);
-                            if (writeConcern.Enabled) { results.Add(intermediateResult); }
+
+                            if (writeConcern.Enabled || (options.Flags & InsertFlags.ContinueOnError) != 0)
+                            {
+                                var intermediateResult = connection.SendMessage(bsonBuffer, message, writeConcern, _database.Name);
+                                if (writeConcern.Enabled) { results.Add(intermediateResult); }
+                            }
+                            else
+                            {
+                                // if WriteConcern is disabled and ContinueOnError is false we have to check for errors and stop if sub-batch has error
+                                try
+                                {
+                                    connection.SendMessage(bsonBuffer, message, WriteConcern.Acknowledged, _database.Name);
+                                }
+                                catch (WriteConcernException)
+                                {
+                                    return null;
+                                }
+                            }
+
                             message.ResetBatch(bsonBuffer, lastDocument);
                         }
                     }

MongoDB.DriverUnitTests/MongoCollectionTests.cs

@@ -1084,6 +1084,80 @@ public void TestInsertBatchContinueOnError()
             }
         }
 
+        [Test]
+        public void TestInsertBatchMultipleBatchesWriteConcernDisabledContinueOnErrorFalse()
+        {
+            var collectionName = Configuration.TestCollection.Name;
+            var collectionSettings = new MongoCollectionSettings { WriteConcern = WriteConcern.Unacknowledged };
+            var collection = Configuration.TestDatabase.GetCollection<BsonDocument>(collectionName, collectionSettings);
+            if (collection.Exists()) { collection.Drop(); }
+
+            using (Configuration.TestDatabase.RequestStart())
+            {
+                var maxMessageLength = Configuration.TestServer.RequestConnection.ServerInstance.MaxMessageLength;
+
+                var filler = new string('x', maxMessageLength / 3); // after overhead results in two documents per sub-batch
+                var documents = new BsonDocument[]
+                {
+                    // first sub-batch
+                    new BsonDocument { { "_id", 1 }, { "filler", filler } },
+                    new BsonDocument { { "_id", 2 }, { "filler", filler } },
+                    // second sub-batch
+                    new BsonDocument { { "_id", 3 }, { "filler", filler } },
+                    new BsonDocument { { "_id", 3 }, { "filler", filler } }, // duplicate _id error
+                    // third sub-batch
+                    new BsonDocument { { "_id", 4 }, { "filler", filler } },
+                    new BsonDocument { { "_id", 5 }, { "filler", filler } },
+                };
+
+                var options = new MongoInsertOptions { Flags = InsertFlags.None }; // no ContinueOnError
+                collection.InsertBatch(documents, options);
+
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 1)));
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 2)));
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 3)));
+                Assert.AreEqual(0, collection.Count(Query.EQ("_id", 4)));
+                Assert.AreEqual(0, collection.Count(Query.EQ("_id", 5)));
+            }
+        }
+
+        [Test]
+        public void TestInsertBatchMultipleBatchesWriteConcernDisabledContinueOnErrorTrue()
+        {
+            var collectionName = Configuration.TestCollection.Name;
+            var collectionSettings = new MongoCollectionSettings { WriteConcern = WriteConcern.Unacknowledged };
+            var collection = Configuration.TestDatabase.GetCollection<BsonDocument>(collectionName, collectionSettings);
+            if (collection.Exists()) { collection.Drop(); }
+
+            using (Configuration.TestDatabase.RequestStart())
+            {
+                var maxMessageLength = Configuration.TestServer.RequestConnection.ServerInstance.MaxMessageLength;
+
+                var filler = new string('x', maxMessageLength / 3); // after overhead results in two documents per sub-batch
+                var documents = new BsonDocument[]
+                {
+                    // first sub-batch
+                    new BsonDocument { { "_id", 1 }, { "filler", filler } },
+                    new BsonDocument { { "_id", 2 }, { "filler", filler } },
+                    // second sub-batch
+                    new BsonDocument { { "_id", 3 }, { "filler", filler } },
+                    new BsonDocument { { "_id", 3 }, { "filler", filler } }, // duplicate _id error
+                    // third sub-batch
+                    new BsonDocument { { "_id", 4 }, { "filler", filler } },
+                    new BsonDocument { { "_id", 5 }, { "filler", filler } },
+                };
+
+                var options = new MongoInsertOptions { Flags = InsertFlags.ContinueOnError };
+                collection.InsertBatch(documents, options);
+
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 1)));
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 2)));
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 3)));
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 4)));
+                Assert.AreEqual(1, collection.Count(Query.EQ("_id", 5)));
+            }
+        }
+
         [Test]
         public void TestIsCappedFalse()
         {