Fix memory leak when using transction to publish message. (#816)

dotnetcore · Apr 6, 2021 · 3ca1083 · 3ca1083
1 parent b764930
commit 3ca1083
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/src/DotNetCore.CAP.MongoDB/CAP.MongoDBCapOptionsExtension.cs b/src/DotNetCore.CAP.MongoDB/CAP.MongoDBCapOptionsExtension.cs
@@ -25,9 +25,7 @@ public void AddServices(IServiceCollection services)
             services.AddSingleton<CapStorageMarkerService>();
 
             services.AddSingleton<IDataStorage, MongoDBDataStorage>();
-            services.AddSingleton<IStorageInitializer, MongoDBStorageInitializer>();
-
-            services.AddTransient<ICapTransaction, MongoDBCapTransaction>();
+            services.AddSingleton<IStorageInitializer, MongoDBStorageInitializer>(); 
 
             services.Configure(_configure);
 

diff --git a/src/DotNetCore.CAP.MongoDB/ICapTransaction.MongoDB.cs b/src/DotNetCore.CAP.MongoDB/ICapTransaction.MongoDB.cs
@@ -81,7 +81,7 @@ public static IClientSessionHandle StartTransaction(this IMongoClient client,
             ICapPublisher publisher, bool autoCommit = false)
         {
             var clientSessionHandle = client.StartSession();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<MongoDBCapTransaction>(publisher.ServiceProvider);
             var capTrans = publisher.Transaction.Value.Begin(clientSessionHandle, autoCommit);
             return new CapMongoDbClientSessionHandle(capTrans);
         }

diff --git a/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs b/src/DotNetCore.CAP.MySql/CAP.MySqlCapOptionsExtension.cs
@@ -26,7 +26,6 @@ public void AddServices(IServiceCollection services)
             services.AddSingleton<IDataStorage, MySqlDataStorage>();
 
             services.TryAddSingleton<IStorageInitializer, MySqlStorageInitializer>();
-            services.AddTransient<ICapTransaction, MySqlCapTransaction>();
 
             //Add MySqlOptions
             services.Configure(_configure);

diff --git a/src/DotNetCore.CAP.MySql/ICapTransaction.MySql.cs b/src/DotNetCore.CAP.MySql/ICapTransaction.MySql.cs
@@ -121,7 +121,7 @@ public static IDbContextTransaction BeginTransaction(this DatabaseFacade databas
             ICapPublisher publisher, bool autoCommit = false)
         {
             var trans = database.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<MySqlCapTransaction>(publisher.ServiceProvider);
             var capTrans = publisher.Transaction.Value.Begin(trans, autoCommit);
             return new CapEFDbTransaction(capTrans);
         }
@@ -142,7 +142,7 @@ public static ICapTransaction BeginTransaction(this IDbConnection dbConnection,
             }
 
             var dbTransaction = dbConnection.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<MySqlCapTransaction>(publisher.ServiceProvider);
             return publisher.Transaction.Value.Begin(dbTransaction, autoCommit);
         }
     }

diff --git a/src/DotNetCore.CAP.PostgreSql/CAP.PostgreSqlCapOptionsExtension.cs b/src/DotNetCore.CAP.PostgreSql/CAP.PostgreSqlCapOptionsExtension.cs
@@ -27,7 +27,6 @@ public void AddServices(IServiceCollection services)
 
             services.AddSingleton<IDataStorage, PostgreSqlDataStorage>();
             services.AddSingleton<IStorageInitializer, PostgreSqlStorageInitializer>();
-            services.AddTransient<ICapTransaction, PostgreSqlCapTransaction>();
         }
     }
 }
diff --git a/src/DotNetCore.CAP.PostgreSql/ICapTransaction.PostgreSql.cs b/src/DotNetCore.CAP.PostgreSql/ICapTransaction.PostgreSql.cs
@@ -124,7 +124,7 @@ public static ICapTransaction BeginTransaction(this IDbConnection dbConnection,
             if (dbConnection.State == ConnectionState.Closed) dbConnection.Open();
 
             var dbTransaction = dbConnection.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<PostgreSqlCapTransaction>(publisher.ServiceProvider);
             return publisher.Transaction.Value.Begin(dbTransaction, autoCommit);
         }
 
@@ -139,7 +139,7 @@ public static IDbContextTransaction BeginTransaction(this DatabaseFacade databas
             ICapPublisher publisher, bool autoCommit = false)
         {
             var trans = database.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<PostgreSqlCapTransaction>(publisher.ServiceProvider);
             var capTrans = publisher.Transaction.Value.Begin(trans, autoCommit);
             return new CapEFDbTransaction(capTrans);
         }

diff --git a/src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs b/src/DotNetCore.CAP.SqlServer/CAP.SqlServerCapOptionsExtension.cs
@@ -29,7 +29,6 @@ public void AddServices(IServiceCollection services)
             services.AddSingleton<DiagnosticProcessorObserver>();
             services.AddSingleton<IDataStorage, SqlServerDataStorage>();
             services.AddSingleton<IStorageInitializer, SqlServerStorageInitializer>();
-            services.AddTransient<ICapTransaction, SqlServerCapTransaction>();
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IProcessingServer, DiagnosticRegister>());
 
             services.Configure(_configure);

diff --git a/src/DotNetCore.CAP.SqlServer/ICapTransaction.SqlServer.cs b/src/DotNetCore.CAP.SqlServer/ICapTransaction.SqlServer.cs
@@ -46,14 +46,14 @@ protected override void AddToSent(MediumMessage msg)
                 if (dbTransaction == null) throw new ArgumentNullException(nameof(DbTransaction));
             }
 
-            var transactionKey = ((SqlConnection) dbTransaction.Connection).ClientConnectionId;
+            var transactionKey = ((SqlConnection)dbTransaction.Connection).ClientConnectionId;
             if (_diagnosticProcessor.BufferList.TryGetValue(transactionKey, out var list))
             {
                 list.Add(msg);
             }
             else
             {
-                var msgList = new List<MediumMessage>(1) {msg};
+                var msgList = new List<MediumMessage>(1) { msg };
                 _diagnosticProcessor.BufferList.TryAdd(transactionKey, msgList);
             }
         }
@@ -163,11 +163,10 @@ public static IDbTransaction BeginTransaction(this IDbConnection dbConnection,
             ICapPublisher publisher, bool autoCommit = false)
         {
             if (dbConnection.State == ConnectionState.Closed) dbConnection.Open();
-
             var dbTransaction = dbConnection.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<SqlServerCapTransaction>(publisher.ServiceProvider);
             var capTransaction = publisher.Transaction.Value.Begin(dbTransaction, autoCommit);
-            return (IDbTransaction) capTransaction.DbTransaction;
+            return (IDbTransaction)capTransaction.DbTransaction;
         }
 
         /// <summary>
@@ -181,7 +180,7 @@ public static IDbContextTransaction BeginTransaction(this DatabaseFacade databas
             ICapPublisher publisher, bool autoCommit = false)
         {
             var trans = database.BeginTransaction();
-            publisher.Transaction.Value = publisher.ServiceProvider.GetService<ICapTransaction>();
+            publisher.Transaction.Value = ActivatorUtilities.CreateInstance<SqlServerCapTransaction>(publisher.ServiceProvider);
             var capTrans = publisher.Transaction.Value.Begin(trans, autoCommit);
             return new CapEFDbTransaction(capTrans);
         }