CSHARP-3552: CSOT: Transactions

src/MongoDB.Driver/AbortTransactionOptions.cs

@@ -0,0 +1,31 @@
+/* Copyright 2010-present 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.
+ */
+
+using System;
+using MongoDB.Driver.Core.Misc;
+
+namespace MongoDB.Driver
+{
+    // TODO: CSOT: Make it public when CSOT will be ready for GA
+    internal sealed class AbortTransactionOptions
+    {
+        public AbortTransactionOptions(TimeSpan? timeout)
+        {
+            Timeout = Ensure.IsNullOrValidTimeout(timeout, nameof(timeout));
+        }
+
+        public TimeSpan? Timeout { get; }
+    }
+}

src/MongoDB.Driver/ClientSessionHandle.cs

@@ -1,4 +1,4 @@
-/* Copyright 2017-present MongoDB Inc.
+/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ namespace MongoDB.Driver
     /// A client session handle.
     /// </summary>
     /// <seealso cref="MongoDB.Driver.IClientSessionHandle" />
-    internal sealed class ClientSessionHandle : IClientSessionHandle
+    internal sealed class ClientSessionHandle : IClientSessionHandle, IClientSessionInternal
     {
         // private fields
         private readonly IMongoClient _client;
@@ -94,16 +94,20 @@ public IServerSession ServerSession
 
         // public methods
         /// <inheritdoc />
-        public void AbortTransaction(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            _coreSession.AbortTransaction(cancellationToken);
-        }
+        public void AbortTransaction(CancellationToken cancellationToken = default)
+            => _coreSession.AbortTransaction(cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        void IClientSessionInternal.AbortTransaction(AbortTransactionOptions options, CancellationToken cancellationToken)
+            => _coreSession.AbortTransaction(options, cancellationToken);
 
         /// <inheritdoc />
-        public Task AbortTransactionAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return _coreSession.AbortTransactionAsync(cancellationToken);
-        }
+        public Task AbortTransactionAsync(CancellationToken cancellationToken = default)
+            => _coreSession.AbortTransactionAsync(cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        Task IClientSessionInternal.AbortTransactionAsync(AbortTransactionOptions options, CancellationToken cancellationToken)
+            => _coreSession.AbortTransactionAsync(options, cancellationToken);
 
         /// <inheritdoc />
         public void AdvanceClusterTime(BsonDocument newClusterTime)
@@ -118,16 +122,20 @@ public void AdvanceOperationTime(BsonTimestamp newOperationTime)
         }
 
         /// <inheritdoc />
-        public void CommitTransaction(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            _coreSession.CommitTransaction(cancellationToken);
-        }
+        public void CommitTransaction(CancellationToken cancellationToken = default)
+            => _coreSession.CommitTransaction(cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        void IClientSessionInternal.CommitTransaction(CommitTransactionOptions options, CancellationToken cancellationToken)
+            => _coreSession.CommitTransaction(options, cancellationToken);
 
         /// <inheritdoc />
-        public Task CommitTransactionAsync(CancellationToken cancellationToken = default(CancellationToken))
-        {
-            return _coreSession.CommitTransactionAsync(cancellationToken);
-        }
+        public Task CommitTransactionAsync(CancellationToken cancellationToken = default)
+            => _coreSession.CommitTransactionAsync(cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        Task IClientSessionInternal.CommitTransactionAsync(CommitTransactionOptions options, CancellationToken cancellationToken)
+            => _coreSession.CommitTransactionAsync(options, cancellationToken);
 
         /// <inheritdoc />
         public void Dispose()

src/MongoDB.Driver/CommitTransactionOptions.cs

@@ -0,0 +1,32 @@
+/* Copyright 2010-present 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.
+ */
+
+using System;
+using MongoDB.Driver.Core.Misc;
+
+namespace MongoDB.Driver
+{
+    // TODO: CSOT: Make it public when CSOT will be ready for GA
+    internal sealed class CommitTransactionOptions
+    {
+        public CommitTransactionOptions(TimeSpan? timeout)
+        {
+            Timeout = Ensure.IsNullOrValidTimeout(timeout, nameof(timeout));
+        }
+
+        public TimeSpan? Timeout { get; }
+    }
+}
+

src/MongoDB.Driver/Core/Bindings/CoreSession.cs

@@ -1,4 +1,4 @@
-/* Copyright 2018-present MongoDB Inc.
+/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ namespace MongoDB.Driver.Core.Bindings
     /// Represents a session.
     /// </summary>
     /// <seealso cref="MongoDB.Driver.Core.Bindings.ICoreSession" />
-    public sealed class CoreSession : ICoreSession
+    public sealed class CoreSession : ICoreSession, ICoreSessionInternal
     {
         // private fields
 #pragma warning disable CA2213 // Disposable fields should be disposed
@@ -141,12 +141,15 @@ public bool IsInTransaction
 
         // public methods
         /// <inheritdoc />
-        public void AbortTransaction(CancellationToken cancellationToken = default(CancellationToken))
+        public void AbortTransaction(CancellationToken cancellationToken = default)
+            => ((ICoreSessionInternal)this).AbortTransaction(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        void ICoreSessionInternal.AbortTransaction(AbortTransactionOptions options, CancellationToken cancellationToken)
         {
             EnsureAbortTransactionCanBeCalled(nameof(AbortTransaction));
 
-            // TODO: CSOT implement proper way to obtain the operationContext
-            var operationContext = new OperationContext(null, cancellationToken);
+            using var operationContext = new OperationContext(GetTimeout(options?.Timeout), cancellationToken);
             try
             {
                 if (_currentTransaction.IsEmpty)
@@ -192,12 +195,15 @@ public bool IsInTransaction
         }
 
         /// <inheritdoc />
-        public async Task AbortTransactionAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public Task AbortTransactionAsync(CancellationToken cancellationToken = default)
+            => ((ICoreSessionInternal)this).AbortTransactionAsync(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        async Task ICoreSessionInternal.AbortTransactionAsync(AbortTransactionOptions options, CancellationToken cancellationToken)
         {
             EnsureAbortTransactionCanBeCalled(nameof(AbortTransaction));
 
-            // TODO: CSOT implement proper way to obtain the operationContext
-            var operationContext = new OperationContext(null, cancellationToken);
+            using var operationContext = new OperationContext(GetTimeout(options?.Timeout), cancellationToken);
             try
             {
                 if (_currentTransaction.IsEmpty)
@@ -292,12 +298,15 @@ public long AdvanceTransactionNumber()
         }
 
         /// <inheritdoc />
-        public void CommitTransaction(CancellationToken cancellationToken = default(CancellationToken))
+        public void CommitTransaction(CancellationToken cancellationToken = default)
+            => ((ICoreSessionInternal)this).CommitTransaction(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        void ICoreSessionInternal.CommitTransaction(CommitTransactionOptions options, CancellationToken cancellationToken)
         {
             EnsureCommitTransactionCanBeCalled(nameof(CommitTransaction));
 
-            // TODO: CSOT implement proper way to obtain the operationContext
-            var operationContext = new OperationContext(null, cancellationToken);
+            using var operationContext = new OperationContext(GetTimeout(options?.Timeout), cancellationToken);
             try
             {
                 _isCommitTransactionInProgress = true;
@@ -329,12 +338,15 @@ public long AdvanceTransactionNumber()
         }
 
         /// <inheritdoc />
-        public async Task CommitTransactionAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public Task CommitTransactionAsync(CancellationToken cancellationToken = default)
+            => ((ICoreSessionInternal)this).CommitTransactionAsync(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA and add default value to cancellationToken parameter.
+        async Task ICoreSessionInternal.CommitTransactionAsync(CommitTransactionOptions options, CancellationToken cancellationToken)
         {
             EnsureCommitTransactionCanBeCalled(nameof(CommitTransaction));
 
-            // TODO: CSOT implement proper way to obtain the operationContext
-            var operationContext = new OperationContext(null, cancellationToken);
+            using var operationContext = new OperationContext(GetTimeout(options?.Timeout), cancellationToken);
             try
             {
                 _isCommitTransactionInProgress = true;
@@ -563,6 +575,9 @@ private async Task<TResult> ExecuteEndTransactionOnPrimaryAsync<TResult>(Operati
             }
         }
 
+        private TimeSpan? GetTimeout(TimeSpan? timeout)
+            => timeout ?? _options.DefaultTransactionOptions?.Timeout;
+
         private TransactionOptions GetEffectiveTransactionOptions(TransactionOptions transactionOptions)
         {
             var readConcern = transactionOptions?.ReadConcern ?? _options.DefaultTransactionOptions?.ReadConcern ?? ReadConcern.Default;

src/MongoDB.Driver/Core/Bindings/CoreTransaction.cs

@@ -1,4 +1,4 @@
-/* Copyright 2018-present MongoDB Inc.
+/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -56,6 +56,8 @@ public CoreTransaction(long transactionNumber, TransactionOptions transactionOpt
         /// </value>
         public bool IsEmpty => _isEmpty;
 
+        internal OperationContext OperationContext { get; set; }
+
         /// <summary>
         /// Gets the transaction state.
         /// </summary>

src/MongoDB.Driver/Core/Bindings/ICoreSessionExtensions.cs

@@ -0,0 +1,67 @@
+/* Copyright 2010-present 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.
+ */
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MongoDB.Driver.Core.Bindings
+{
+    // TODO: CSOT: Make it public when CSOT will be ready for GA
+    internal static class ICoreSessionExtensions
+    {
+        // TODO: Merge these extension methods in ICoreSession interface on major release
+        public static void AbortTransaction(this ICoreSession session, AbortTransactionOptions options, CancellationToken cancellationToken = default)
+        {
+            if (options == null || session.Options.DefaultTransactionOptions?.Timeout == options.Timeout)
+            {
+                session.AbortTransaction(cancellationToken);
+                return;
+            }
+
+            ((ICoreSessionInternal)session).AbortTransaction(options, cancellationToken);
+        }
+
+        public static Task AbortTransactionAsync(this ICoreSession session, AbortTransactionOptions options, CancellationToken cancellationToken = default)
+        {
+            if (options == null || session.Options.DefaultTransactionOptions?.Timeout == options.Timeout)
+            {
+                return session.AbortTransactionAsync(cancellationToken);
+            }
+
+            return ((ICoreSessionInternal)session).AbortTransactionAsync(options, cancellationToken);
+        }
+
+        public static void CommitTransaction(this ICoreSession session, CommitTransactionOptions options, CancellationToken cancellationToken = default)
+        {
+            if (options == null || session.Options.DefaultTransactionOptions?.Timeout == options.Timeout)
+            {
+                session.CommitTransaction(cancellationToken);
+                return;
+            }
+
+            ((ICoreSessionInternal)session).CommitTransaction(options, cancellationToken);
+        }
+
+        public static Task CommitTransactionAsync(this ICoreSession session, CommitTransactionOptions options, CancellationToken cancellationToken = default)
+        {
+            if (options == null || session.Options.DefaultTransactionOptions?.Timeout == options.Timeout)
+            {
+                return session.CommitTransactionAsync(cancellationToken);
+            }
+
+            return ((ICoreSessionInternal)session).CommitTransactionAsync(options, cancellationToken);
+        }
+    }
+}

src/MongoDB.Driver/Core/Bindings/ICoreSessionInternal.cs

@@ -0,0 +1,28 @@
+/* Copyright 2010-present 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.
+ */
+
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MongoDB.Driver.Core.Bindings;
+
+// TODO: Merge this interface into ICoreSession on major release
+internal interface ICoreSessionInternal
+{
+    void AbortTransaction(AbortTransactionOptions options, CancellationToken cancellationToken = default);
+    Task AbortTransactionAsync(AbortTransactionOptions options, CancellationToken cancellationToken = default);
+    void CommitTransaction(CommitTransactionOptions options, CancellationToken cancellationToken = default);
+    Task CommitTransactionAsync(CommitTransactionOptions options, CancellationToken cancellationToken = default);
+}