CSHARP-1688: Support sending WriteConcern for commands that write.

Author: rstam

src/MongoDB.Driver.Core/Core/Misc/CommandsThatWriteAcceptWriteConcernFeature.cs

@@ -0,0 +1,44 @@
+/* Copyright 2016 MongoDB Inc.
+*
+* 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.
+*/
+
+namespace MongoDB.Driver.Core.Misc
+{
+    /// <summary>
+    /// Represents the commands that write accept write concern concern feature.
+    /// </summary>
+    /// <seealso cref="MongoDB.Driver.Core.Misc.Feature" />
+    public class CommandsThatWriteAcceptWriteConcernFeature : Feature
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandsThatWriteAcceptWriteConcernFeature"/> class.
+        /// </summary>
+        /// <param name="name">The name of the feature.</param>
+        /// <param name="firstSupportedVersion">The first server version that supports the feature.</param>
+        public CommandsThatWriteAcceptWriteConcernFeature(string name, SemanticVersion firstSupportedVersion)
+            : base(name, firstSupportedVersion)
+        {
+        }
+
+        /// <summary>
+        /// Returns true if the write concern value supplied is one that should be sent to the server and the server version supports the commands that write accept write concern feature.
+        /// </summary>
+        /// <param name="serverVersion">The server version.</param>
+        /// <param name="value">The write concern value.</param>
+        public bool ShouldSendWriteConcern(SemanticVersion serverVersion, WriteConcern value)
+        {
+            return value != null && !value.IsServerDefault && base.IsSupported(serverVersion);
+        }
+    }
+}

src/MongoDB.Driver.Core/Core/Misc/Feature.cs

@@ -30,7 +30,7 @@ public class Feature
         private static readonly Feature __aggregateOut = new Feature("Aggregate", new SemanticVersion(2, 6, 0));
         private static readonly Feature __bypassDocumentValidation = new Feature("BypassDocumentValidation", new SemanticVersion(3, 2, 0));
         private static readonly CollationFeature __collation = new CollationFeature("Collation", new SemanticVersion(3, 3, 11));
-        private static readonly Feature __commandsWriteConcern = new Feature("CommandsWriteConcern", new SemanticVersion(3, 3, 11));
+        private static readonly CommandsThatWriteAcceptWriteConcernFeature __commandsThatWriteAcceptWriteConcern = new CommandsThatWriteAcceptWriteConcernFeature("CommandsThatWriteAcceptWriteConcern", new SemanticVersion(3, 3, 11));
         private static readonly Feature __createIndexesCommand = new Feature("CreateIndexesCommand", new SemanticVersion(3, 0, 0));
         private static readonly Feature __currentOpCommand = new Feature("CurrentOpCommand", new SemanticVersion(3, 2, 0));
         private static readonly Feature __documentValidation = new Feature("DocumentValidation", new SemanticVersion(3, 2, 0));
@@ -86,9 +86,9 @@ public class Feature
         public static CollationFeature Collation => __collation;
 
         /// <summary>
-        /// Gets the commands write concern feature.
+        /// Gets the commands that write accept write concern feature.
         /// </summary>
-        public static Feature CommandsWriteConcern => __commandsWriteConcern;
+        public static CommandsThatWriteAcceptWriteConcernFeature CommandsThatWriteAcceptWriteConcern => __commandsThatWriteAcceptWriteConcern;
 
         /// <summary>
         /// Gets the create indexes command feature.

src/MongoDB.Driver.Core/Core/Operations/AggregateToCollectionOperation.cs

@@ -39,6 +39,7 @@ public class AggregateToCollectionOperation : IWriteOperation<BsonDocument>
         private TimeSpan? _maxTime;
         private readonly MessageEncoderSettings _messageEncoderSettings;
         private readonly IReadOnlyList<BsonDocument> _pipeline;
+        private WriteConcern _writeConcern;
 
         // constructors
         /// <summary>
@@ -138,6 +139,18 @@ public IReadOnlyList<BsonDocument> Pipeline
             get { return _pipeline; }
         }
 
+        /// <summary>
+        /// Gets or sets the write concern.
+        /// </summary>
+        /// <value>
+        /// The write concern.
+        /// </value>
+        public WriteConcern WriteConcern
+        {
+            get { return _writeConcern; }
+            set { _writeConcern = value; }
+        }
+
         // methods
         /// <inheritdoc/>
         public BsonDocument Execute(IWriteBinding binding, CancellationToken cancellationToken)
@@ -178,7 +191,8 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
                 { "allowDiskUse", () => _allowDiskUse.Value, _allowDiskUse.HasValue },
                 { "bypassDocumentValidation", () => _bypassDocumentValidation.Value, _bypassDocumentValidation.HasValue && Feature.BypassDocumentValidation.IsSupported(serverVersion) },
                 { "maxTimeMS", () => _maxTime.Value.TotalMilliseconds, _maxTime.HasValue },
-                { "collation", () => _collation.ToBsonDocument(), _collation != null }
+                { "collation", () => _collation.ToBsonDocument(), _collation != null },
+                { "writeConcern", () => _writeConcern.ToBsonDocument(), Feature.CommandsThatWriteAcceptWriteConcern.ShouldSendWriteConcern(serverVersion, _writeConcern) }
             };
         }
 

src/MongoDB.Driver.Core/Core/Operations/CreateCollectionOperation.cs

@@ -44,6 +44,7 @@ public class CreateCollectionOperation : IWriteOperation<BsonDocument>
         private DocumentValidationAction? _validationAction;
         private DocumentValidationLevel? _validationLevel;
         private BsonDocument _validator;
+        private WriteConcern _writeConcern;
 
         // constructors
         /// <summary>
@@ -214,6 +215,18 @@ public BsonDocument Validator
             set { _validator = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the write concern.
+        /// </summary>
+        /// <value>
+        /// The write concern.
+        /// </value>
+        public WriteConcern WriteConcern
+        {
+            get { return _writeConcern; }
+            set { _writeConcern = value; }
+        }
+
         // methods
         internal BsonDocument CreateCommand(SemanticVersion serverVersion)
         {
@@ -232,7 +245,8 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
                 { "validator", _validator, _validator != null },
                 { "validationAction", () => _validationAction.Value.ToString().ToLowerInvariant(), _validationAction.HasValue },
                 { "validationLevel", () => _validationLevel.Value.ToString().ToLowerInvariant(), _validationLevel.HasValue },
-                { "collation", () => _collation.ToBsonDocument(), _collation != null }
+                { "collation", () => _collation.ToBsonDocument(), _collation != null },
+                { "writeConcern", () => _writeConcern.ToBsonDocument(), Feature.CommandsThatWriteAcceptWriteConcern.ShouldSendWriteConcern(serverVersion, _writeConcern) }
             };
         }
 

src/MongoDB.Driver.Core/Core/Operations/CreateIndexesOperation.cs

@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 MongoDB Inc.
+/* Copyright 2013-2016 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -111,7 +111,7 @@ public BsonDocument Execute(IWriteBinding binding, CancellationToken cancellatio
             using (var channel = channelSource.GetChannel(cancellationToken))
             using (var channelBinding = new ChannelReadWriteBinding(channelSource.Server, channel))
             {
-                var operation = CreateOperation(channel);
+                var operation = CreateOperation(channel.ConnectionDescription.ServerVersion);
                 return operation.Execute(channelBinding, cancellationToken);
             }
         }
@@ -124,21 +124,27 @@ public async Task<BsonDocument> ExecuteAsync(IWriteBinding binding, Cancellation
             using (var channel = await channelSource.GetChannelAsync(cancellationToken).ConfigureAwait(false))
             using (var channelBinding = new ChannelReadWriteBinding(channelSource.Server, channel))
             {
-                var operation = CreateOperation(channel);
+                var operation = CreateOperation(channel.ConnectionDescription.ServerVersion);
                 return await operation.ExecuteAsync(channelBinding, cancellationToken).ConfigureAwait(false);
             }
         }
 
         // private methods
-        private IWriteOperation<BsonDocument> CreateOperation(IChannel channel)
+        internal IWriteOperation<BsonDocument> CreateOperation(SemanticVersion serverVersion)
         {
-            if (Feature.CreateIndexesCommand.IsSupported(channel.ConnectionDescription.ServerVersion))
+            if (Feature.CreateIndexesCommand.IsSupported(serverVersion))
             {
-                return new CreateIndexesUsingCommandOperation(_collectionNamespace, _requests, _messageEncoderSettings);
+                return new CreateIndexesUsingCommandOperation(_collectionNamespace, _requests, _messageEncoderSettings)
+                {
+                    WriteConcern = _writeConcern
+                };
             }
             else
             {
-                return new CreateIndexesUsingInsertOperation(_collectionNamespace, _requests, _messageEncoderSettings);
+                return new CreateIndexesUsingInsertOperation(_collectionNamespace, _requests, _messageEncoderSettings)
+                {
+                    WriteConcern = _writeConcern
+                };
             }
         }
    }

src/MongoDB.Driver.Core/Core/Operations/CreateIndexesUsingCommandOperation.cs

@@ -41,7 +41,7 @@ public class CreateIndexesUsingCommandOperation : IWriteOperation<BsonDocument>
 
         // constructors
         /// <summary>
-        /// Initializes a new instance of the <see cref="CreateIndexesOperation"/> class.
+        /// Initializes a new instance of the <see cref="CreateIndexesUsingCommandOperation"/> class.
         /// </summary>
         /// <param name="collectionNamespace">The collection namespace.</param>
         /// <param name="requests">The requests.</param>
@@ -135,7 +135,8 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
             return new BsonDocument
             {
                 { "createIndexes", _collectionNamespace.CollectionName },
-                { "indexes", new BsonArray(_requests.Select(request => request.CreateIndexDocument(serverVersion))) }
+                { "indexes", new BsonArray(_requests.Select(request => request.CreateIndexDocument(serverVersion))) },
+                { "writeConcern", () => _writeConcern.ToBsonDocument(), Feature.CommandsThatWriteAcceptWriteConcern.ShouldSendWriteConcern(serverVersion, _writeConcern) }
             };
         }
 

src/MongoDB.Driver.Core/Core/Operations/CreateIndexesUsingInsertOperation.cs

@@ -41,7 +41,7 @@ public class CreateIndexesUsingInsertOperation : IWriteOperation<BsonDocument>
 
         // constructors
         /// <summary>
-        /// Initializes a new instance of the <see cref="CreateIndexesOperation"/> class.
+        /// Initializes a new instance of the <see cref="CreateIndexesUsingInsertOperation"/> class.
         /// </summary>
         /// <param name="collectionNamespace">The collection namespace.</param>
         /// <param name="requests">The requests.</param>
@@ -140,7 +140,7 @@ public async Task<BsonDocument> ExecuteAsync(IWriteBinding binding, Cancellation
         }
 
         // private methods
-        private InsertOpcodeOperation<BsonDocument> CreateOperation(SemanticVersion serverVersion, CreateIndexRequest createIndexRequest)
+        internal InsertOpcodeOperation<BsonDocument> CreateOperation(SemanticVersion serverVersion, CreateIndexRequest createIndexRequest)
         {
             var systemIndexesCollection = _collectionNamespace.DatabaseNamespace.SystemIndexesCollection;
             var document = createIndexRequest.CreateIndexDocument(serverVersion);
@@ -150,7 +150,10 @@ private InsertOpcodeOperation<BsonDocument> CreateOperation(SemanticVersion serv
                 systemIndexesCollection,
                 documentSource,
                 BsonDocumentSerializer.Instance,
-                _messageEncoderSettings);
+                _messageEncoderSettings)
+            {
+                WriteConcern = _writeConcern
+            };
         }
     }
 }

src/MongoDB.Driver.Core/Core/Operations/CreateViewOperation.cs

@@ -183,7 +183,7 @@ internal BsonDocument CreateCommand(SemanticVersion serverVersion)
                 { "viewOn", _viewOn },
                 { "pipeline", new BsonArray(_pipeline) },
                 { "collation", () => _collation.ToBsonDocument(), _collation != null },
-                { "writeConcern", () => _writeConcern.ToBsonDocument(), _writeConcern != null && !_writeConcern.IsServerDefault && Feature.CommandsWriteConcern.IsSupported(serverVersion) }
+                { "writeConcern", () => _writeConcern.ToBsonDocument(), Feature.CommandsThatWriteAcceptWriteConcern.ShouldSendWriteConcern(serverVersion, _writeConcern) }
             };
         }
 

src/MongoDB.Driver.Core/Core/Operations/DropCollectionOperation.cs

@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 MongoDB Inc.
+/* Copyright 2013-2016 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ public class DropCollectionOperation : IWriteOperation<BsonDocument>
         // fields
         private readonly CollectionNamespace _collectionNamespace;
         private readonly MessageEncoderSettings _messageEncoderSettings;
+        private WriteConcern _writeConcern;
 
         // constructors
         /// <summary>
@@ -70,54 +71,82 @@ public MessageEncoderSettings MessageEncoderSettings
             get { return _messageEncoderSettings; }
         }
 
+        /// <summary>
+        /// Gets or sets the write concern.
+        /// </summary>
+        /// <value>
+        /// The write concern.
+        /// </value>
+        public WriteConcern WriteConcern
+        {
+            get { return _writeConcern; }
+            set { _writeConcern = value; }
+        }
+
         // public methods
         /// <inheritdoc/>
         public BsonDocument Execute(IWriteBinding binding, CancellationToken cancellationToken)
         {
             Ensure.IsNotNull(binding, nameof(binding));
-            var operation = CreateOperation();
-            try
-            {
-                return operation.Execute(binding, cancellationToken);
-            }
-            catch (MongoCommandException ex)
+
+            using (var channelSource = binding.GetWriteChannelSource(cancellationToken))
+            using (var channel = channelSource.GetChannel(cancellationToken))
+            using (var channelBinding = new ChannelReadWriteBinding(channelSource.Server, channel))
             {
-                if (ShouldIgnoreException(ex))
+                var operation = CreateOperation(channel.ConnectionDescription.ServerVersion);
+                try
+                {
+                    return operation.Execute(binding, cancellationToken);
+                }
+                catch (MongoCommandException ex)
                 {
-                    return ex.Result;
+                    if (ShouldIgnoreException(ex))
+                    {
+                        return ex.Result;
+                    }
+                    throw;
                 }
-                throw;
             }
         }
 
         /// <inheritdoc/>
         public async Task<BsonDocument> ExecuteAsync(IWriteBinding binding, CancellationToken cancellationToken)
         {
             Ensure.IsNotNull(binding, nameof(binding));
-            var operation = CreateOperation();
-            try
-            {
-                return await operation.ExecuteAsync(binding, cancellationToken).ConfigureAwait(false);
-            }
-            catch (MongoCommandException ex)
+
+            using (var channelSource = await binding.GetWriteChannelSourceAsync(cancellationToken).ConfigureAwait(false))
+            using (var channel = await channelSource.GetChannelAsync(cancellationToken).ConfigureAwait(false))
+            using (var channelBinding = new ChannelReadWriteBinding(channelSource.Server, channel))
             {
-                if (ShouldIgnoreException(ex))
+                var operation = CreateOperation(channel.ConnectionDescription.ServerVersion);
+                try
+                {
+                    return await operation.ExecuteAsync(binding, cancellationToken).ConfigureAwait(false);
+                }
+                catch (MongoCommandException ex)
                 {
-                    return ex.Result;
+                    if (ShouldIgnoreException(ex))
+                    {
+                        return ex.Result;
+                    }
+                    throw;
                 }
-                throw;
             }
         }
 
         // private methods
-        internal BsonDocument CreateCommand()
+        internal BsonDocument CreateCommand(SemanticVersion serverVersion)
         {
-            return new BsonDocument { { "drop", _collectionNamespace.CollectionName } };
+            return new BsonDocument
+            {
+                { "drop", _collectionNamespace.CollectionName },
+                { "writeConcern", () => _writeConcern.ToBsonDocument(), Feature.CommandsThatWriteAcceptWriteConcern.ShouldSendWriteConcern(serverVersion, _writeConcern) }
+            };
         }
 
-        private WriteCommandOperation<BsonDocument> CreateOperation()
+        private WriteCommandOperation<BsonDocument> CreateOperation(SemanticVersion serverVersion)
         {
-            var command = CreateCommand();
+            var command = CreateCommand(serverVersion);
             return new WriteCommandOperation<BsonDocument>(_collectionNamespace.DatabaseNamespace, command, BsonDocumentSerializer.Instance, _messageEncoderSettings);
         }