CSHARP-915: changed MongoServerInstance.MaxWireBatchSize to MaxBatchCount. Using MongoServerInstance.MaxBatchCount in MongoCollection.

Author: craiggwilson

MongoDB.Driver/Communication/MongoServerInstance.cs

@@ -303,18 +303,18 @@ public int MaxWireDocumentSize
         }
 
         /// <summary>
-        /// Gets the maximum size of the wire batch.
+        /// Gets the maximum batch count for write operations.
         /// </summary>
         /// <value>
-        /// The maximum size of the wire batch.
+        /// The maximum batch count.
         /// </value>
-        public int MaxWireBatchSize
+        public int MaxBatchCount
         {
             get
             {
                 lock (_serverInstanceLock)
                 {
-                    return _serverInfo.MaxWireBatchSize;
+                    return _serverInfo.MaxBatchCount;
                 }
             }
         }
@@ -720,7 +720,7 @@ private void LookupServerInformation(MongoConnection connection)
                         IsSecondary = false,
                         MaxDocumentSize = currentServerInfo.MaxDocumentSize,
                         MaxMessageLength = currentServerInfo.MaxMessageLength,
-                        MaxWireBatchSize = currentServerInfo.MaxWireBatchSize,
+                        MaxBatchCount = currentServerInfo.MaxBatchCount,
                         ReplicaSetInformation = currentServerInfo.ReplicaSetInformation
                     };
 
@@ -878,7 +878,7 @@ private class ServerInformation
 
             public int MaxWireDocumentSize { get { return MaxDocumentSize + 16 * 1024; } }
 
-            public int MaxWireBatchSize { get; set; }
+            public int MaxBatchCount { get; set; }
 
             public ReplicaSetInformation ReplicaSetInformation { get; set; }
 
@@ -924,7 +924,7 @@ public bool IsDifferentFrom(ServerInformation other)
                     return true;
                 }
 
-                if (MaxWireBatchSize != other.MaxWireBatchSize)
+                if (MaxBatchCount != other.MaxBatchCount)
                 {
                     return true;
                 }

MongoDB.Driver/MongoCollection.cs

@@ -195,12 +195,12 @@ public virtual BulkWriteResult BulkWrite(BulkWriteArgs args)
             {
                 var assignId = args.AssignId ?? (_settings.AssignIdOnInsert ? (Action<InsertRequest>)AssignId : null);
                 var checkElementNames = args.CheckElementNames ?? true;
-                var maxBatchCount = args.MaxBatchCount ?? 1000;
+                var maxBatchCount = args.MaxBatchCount ?? connection.ServerInstance.MaxBatchCount;
                 var maxBatchLength = Math.Min(args.MaxBatchLength ?? int.MaxValue, connection.ServerInstance.MaxDocumentSize);
                 var maxDocumentSize = connection.ServerInstance.MaxDocumentSize;
                 var maxWireDocumentSize = connection.ServerInstance.MaxWireDocumentSize;
                 var writeConcern = args.WriteConcern ?? _settings.WriteConcern;
-
+                
                 var operation = new BulkMixedWriteOperation(
                     assignId,
                     checkElementNames,