pr

Author: Oleksandr Poliakov

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

@@ -37,12 +37,19 @@ public static void AbortTransaction(this ICoreSession session, AbortTransactionO
                 return;
             }
 
-            if (session is not CoreSession coreSession)
+            if (session is CoreSession coreSession)
             {
-                throw new InvalidOperationException("Cannot apply options on non CoreSession.");
+                coreSession.AbortTransaction(options, cancellationToken);
+                return;
+            }
+
+            if (session is WrappingCoreSession wrappingCoreSession)
+            {
+                wrappingCoreSession.AbortTransaction(options, cancellationToken);
+                return;
             }
 
-            coreSession.AbortTransaction(options, cancellationToken);
+            throw new InvalidOperationException("Cannot apply options on non CoreSession.");
         }
 
         /// <summary>
@@ -58,12 +65,17 @@ public static Task AbortTransactionAsync(this ICoreSession session, AbortTransac
                 return session.AbortTransactionAsync(cancellationToken);
             }
 
-            if (session is not CoreSession coreSession)
+            if (session is CoreSession coreSession)
+            {
+                return coreSession.AbortTransactionAsync(options, cancellationToken);
+            }
+
+            if (session is WrappingCoreSession wrappingCoreSession)
             {
-                throw new InvalidOperationException("Cannot apply options on non CoreSession.");
+                return wrappingCoreSession.AbortTransactionAsync(options, cancellationToken);
             }
 
-            return coreSession.AbortTransactionAsync(options, cancellationToken);
+            throw new InvalidOperationException("Cannot apply options on non CoreSession.");
         }
 
         /// <summary>
@@ -80,12 +92,19 @@ public static void CommitTransaction(this ICoreSession session, CommitTransactio
                 return;
             }
 
-            if (session is not CoreSession coreSession)
+            if (session is CoreSession coreSession)
             {
-                throw new InvalidOperationException("Cannot apply options on non CoreSession.");
+                coreSession.CommitTransaction(options, cancellationToken);
+                return;
+            }
+
+            if (session is WrappingCoreSession wrappingCoreSession)
+            {
+                wrappingCoreSession.CommitTransaction(options, cancellationToken);
+                return;
             }
 
-            coreSession.CommitTransaction(options, cancellationToken);
+            throw new InvalidOperationException("Cannot apply options on non CoreSession.");
         }
 
         /// <summary>
@@ -101,12 +120,17 @@ public static Task CommitTransactionAsync(this ICoreSession session, CommitTrans
                 return session.CommitTransactionAsync(cancellationToken);
             }
 
-            if (session is not CoreSession coreSession)
+            if (session is CoreSession coreSession)
+            {
+                return coreSession.CommitTransactionAsync(options, cancellationToken);
+            }
+
+            if (session is WrappingCoreSession wrappingCoreSession)
             {
-                throw new InvalidOperationException("Cannot apply options on non CoreSession.");
+                return wrappingCoreSession.CommitTransactionAsync(options, cancellationToken);
             }
 
-            return coreSession.CommitTransactionAsync(options, cancellationToken);
+            throw new InvalidOperationException("Cannot apply options on non CoreSession.");
         }
     }
 }

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

@@ -182,17 +182,25 @@ public ICoreSession Wrapped
 
         // public methods
         /// <inheritdoc />
-        public virtual void AbortTransaction(CancellationToken cancellationToken = default(CancellationToken))
+        public void AbortTransaction(CancellationToken cancellationToken = default)
+            => AbortTransaction(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA
+        internal virtual void AbortTransaction(AbortTransactionOptions options, CancellationToken cancellationToken = default)
         {
             ThrowIfDisposed();
-            _wrapped.AbortTransaction(cancellationToken);
+            _wrapped.AbortTransaction(options, cancellationToken);
         }
 
         /// <inheritdoc />
-        public virtual Task AbortTransactionAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public Task AbortTransactionAsync(CancellationToken cancellationToken = default)
+            => AbortTransactionAsync(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA
+        internal Task AbortTransactionAsync(AbortTransactionOptions options, CancellationToken cancellationToken = default)
         {
             ThrowIfDisposed();
-            return _wrapped.AbortTransactionAsync(cancellationToken);
+            return _wrapped.AbortTransactionAsync(options, cancellationToken);
         }
 
         /// <inheritdoc />
@@ -223,17 +231,25 @@ public long AdvanceTransactionNumber()
         }
 
         /// <inheritdoc />
-        public virtual void CommitTransaction(CancellationToken cancellationToken = default(CancellationToken))
+        public void CommitTransaction(CancellationToken cancellationToken = default)
+            => CommitTransaction(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA
+        internal void CommitTransaction(CommitTransactionOptions options, CancellationToken cancellationToken = default)
         {
             ThrowIfDisposed();
-            _wrapped.CommitTransaction(cancellationToken);
+            _wrapped.CommitTransaction(options, cancellationToken);
         }
 
         /// <inheritdoc />
-        public virtual Task CommitTransactionAsync(CancellationToken cancellationToken = default(CancellationToken))
+        public Task CommitTransactionAsync(CancellationToken cancellationToken = default)
+            => CommitTransactionAsync(null, cancellationToken);
+
+        // TODO: CSOT: Make it public when CSOT will be ready for GA
+        internal Task CommitTransactionAsync(CommitTransactionOptions options, CancellationToken cancellationToken = default(CancellationToken))
         {
             ThrowIfDisposed();
-            return _wrapped.CommitTransactionAsync(cancellationToken);
+            return _wrapped.CommitTransactionAsync(options, cancellationToken);
         }
 
         /// <inheritdoc />