Resolved #7489: Async implementation for Transaction Commit/Rollback.

abpframework · Jan 28, 2021 · 103b211 · 103b211
1 parent 7e902d7
commit 103b211
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 61 deletions.
diff --git a/...src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs b/...src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs
@@ -5,6 +5,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.Uow.EntityFrameworkCore
 {
@@ -14,22 +15,22 @@ public class EfCoreTransactionApi : ITransactionApi, ISupportsRollback
         public IEfCoreDbContext StarterDbContext { get; }
         public List<IEfCoreDbContext> AttendedDbContexts { get; }
 
-        public EfCoreTransactionApi(IDbContextTransaction dbContextTransaction, IEfCoreDbContext starterDbContext)
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
+
+        public EfCoreTransactionApi(
+            IDbContextTransaction dbContextTransaction,
+            IEfCoreDbContext starterDbContext,
+            ICancellationTokenProvider cancellationTokenProvider)
         {
             DbContextTransaction = dbContextTransaction;
             StarterDbContext = starterDbContext;
+            CancellationTokenProvider = cancellationTokenProvider;
             AttendedDbContexts = new List<IEfCoreDbContext>();
         }
 
-        public Task CommitAsync()
-        {
-            Commit();
-            return Task.CompletedTask;
-        }
-
-        protected void Commit()
+        public async Task CommitAsync()
         {
-            DbContextTransaction.Commit();
+            await DbContextTransaction.CommitAsync(CancellationTokenProvider.Token);
 
             foreach (var dbContext in AttendedDbContexts)
             {
@@ -38,7 +39,7 @@ protected void Commit()
                     continue; //Relational databases use the shared transaction
                 }
 
-                dbContext.Database.CommitTransaction();
+                await dbContext.Database.CommitTransactionAsync(CancellationTokenProvider.Token);
             }
         }
 
@@ -47,15 +48,11 @@ public void Dispose()
             DbContextTransaction.Dispose();
         }
 
-        public void Rollback()
-        {
-            DbContextTransaction.Rollback();
-        }
-
         public Task RollbackAsync(CancellationToken cancellationToken)
         {
-            DbContextTransaction.Rollback();
-            return Task.CompletedTask;
+            return DbContextTransaction.RollbackAsync(
+                CancellationTokenProvider.FallbackToProvider(cancellationToken)
+            );
         }
     }
-}
+}
diff --git a/...o.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs b/...o.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
@@ -168,7 +168,8 @@ private TDbContext CreateDbContextWithTransaction(IUnitOfWork unitOfWork)
                     transactionApiKey,
                     new EfCoreTransactionApi(
                         dbtransaction,
-                        dbContext
+                        dbContext,
+                        _cancellationTokenProvider
                     )
                 );
 
@@ -212,7 +213,8 @@ private async Task<TDbContext> CreateDbContextWithTransactionAsync(IUnitOfWork u
                     transactionApiKey,
                     new EfCoreTransactionApi(
                         dbTransaction,
-                        dbContext
+                        dbContext,
+                        _cancellationTokenProvider
                     )
                 );
 

diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbTransactionApi.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/MongoDbTransactionApi.cs
@@ -1,42 +1,39 @@
-using System.Collections.Generic;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
+using Volo.Abp.Threading;
 
 namespace Volo.Abp.Uow.MongoDB
 {
     public class MongoDbTransactionApi : ITransactionApi, ISupportsRollback
     {
         public IClientSessionHandle SessionHandle { get; }
 
-        public MongoDbTransactionApi(IClientSessionHandle sessionHandle)
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
+
+        public MongoDbTransactionApi(
+            IClientSessionHandle sessionHandle,
+            ICancellationTokenProvider cancellationTokenProvider)
         {
             SessionHandle = sessionHandle;
+            CancellationTokenProvider = cancellationTokenProvider;
         }
 
         public async Task CommitAsync()
         {
-            await SessionHandle.CommitTransactionAsync();
-        }
-
-        protected void Commit()
-        {
-            SessionHandle.CommitTransaction();
+            await SessionHandle.CommitTransactionAsync(CancellationTokenProvider.Token);
         }
 
         public void Dispose()
         {
             SessionHandle.Dispose();
         }
 
-        public void Rollback()
-        {
-            SessionHandle.AbortTransaction();
-        }
-
         public async Task RollbackAsync(CancellationToken cancellationToken)
         {
-            await SessionHandle.AbortTransactionAsync(cancellationToken);
+            await SessionHandle.AbortTransactionAsync(
+                CancellationTokenProvider.FallbackToProvider(cancellationToken)
+            );
         }
     }
 }
diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
@@ -178,7 +178,10 @@ private TMongoDbContext CreateDbContextWithTransaction(
 
                 unitOfWork.AddTransactionApi(
                     transactionApiKey,
-                    new MongoDbTransactionApi(session)
+                    new MongoDbTransactionApi(
+                        session,
+                        _cancellationTokenProvider
+                    )
                 );
 
                 dbContext.ToAbpMongoDbContext().InitializeDatabase(database, client, session);
@@ -215,7 +218,10 @@ private async Task<TMongoDbContext> CreateDbContextWithTransactionAsync(
 
                 unitOfWork.AddTransactionApi(
                     transactionApiKey,
-                    new MongoDbTransactionApi(session)
+                    new MongoDbTransactionApi(
+                        session,
+                        _cancellationTokenProvider
+                    )
                 );
 
                 dbContext.ToAbpMongoDbContext().InitializeDatabase(database, client, session);

diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsRollback.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsRollback.cs
@@ -5,8 +5,6 @@ namespace Volo.Abp.Uow
 {
     public interface ISupportsRollback
     {
-        void Rollback();
-
         Task RollbackAsync(CancellationToken cancellationToken);
     }
-}
+}
diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs
@@ -262,27 +262,6 @@ private void PreventMultipleComplete()
             }
         }
 
-        protected virtual void RollbackAll()
-        {
-            foreach (var databaseApi in GetAllActiveDatabaseApis())
-            {
-                try
-                {
-                    (databaseApi as ISupportsRollback)?.Rollback();
-                }
-                catch { }
-            }
-
-            foreach (var transactionApi in GetAllActiveTransactionApis())
-            {
-                try
-                {
-                    (transactionApi as ISupportsRollback)?.Rollback();
-                }
-                catch { }
-            }
-        }
-
         protected virtual async Task RollbackAllAsync(CancellationToken cancellationToken)
         {
             foreach (var databaseApi in GetAllActiveDatabaseApis())