tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 移除 fsql.Transaction 线程事务超时机制；#323

Browse Source
This commit is contained in:
28810
2020-05-23 18:55:33 +08:00
parent ce3bd7da1d
commit b3352faef5
18 changed files with 33 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
FreeSql/FreeSql.xml
View File

@ -2257,25 +2257,17 @@
</summary>
</member>
<member name="M:FreeSql.IAdo.Transaction(System.Action)">
<summary>
开启事务（不支持异步），60秒未执行完成（可能）被其他线程事务自动提交
</summary>
<param name="handler">事务体 () => {}</param>
</member>
<member name="M:FreeSql.IAdo.Transaction(System.TimeSpan,System.Action)">
<summary>
开启事务（不支持异步）
</summary>
<param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
<param name="handler">事务体 () => {}</param>
</member>
<member name="M:FreeSql.IAdo.Transaction(System.Data.IsolationLevel,System.TimeSpan,System.Action)">
<member name="M:FreeSql.IAdo.Transaction(System.Data.IsolationLevel,System.Action)">
<summary>
开启事务（不支持异步）
</summary>
<param name="isolationLevel"></param>
<param name="handler">事务体 () => {}</param>
<param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
</member>
<member name="P:FreeSql.IAdo.TransactionCurrentThread">
<summary>
@ -3829,24 +3821,18 @@
</member>
<member name="M:IFreeSql.Transaction(System.Action)">
<summary>
开启事务（不支持异步），60秒未执行完成（可能）被其他线程事务自动提交
开启事务（不支持异步）<para></para>
v1.5.0 关闭了线程事务超时自动提交的机制
</summary>
<param name="handler">事务体 () => {}</param>
</member>
<member name="M:IFreeSql.Transaction(System.TimeSpan,System.Action)">
<member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.Action)">
<summary>
开启事务（不支持异步）
</summary>
<param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
<param name="handler">事务体 () => {}</param>
</member>
<member name="M:IFreeSql.Transaction(System.Data.IsolationLevel,System.TimeSpan,System.Action)">
<summary>
开启事务（不支持异步）
开启事务（不支持异步）<para></para>
v1.5.0 关闭了线程事务超时自动提交的机制
</summary>
<param name="isolationLevel"></param>
<param name="handler">事务体 () => {}</param>
<param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
</member>
<member name="P:IFreeSql.Ado">
<summary>

11
FreeSql/Interface/IAdo.cs
View File

@ -39,23 +39,16 @@ namespace FreeSql
#region 事务
/// <summary>
/// 开启事务（不支持异步），60秒未执行完成（可能）被其他线程事务自动提交
/// 开启事务（不支持异步）
/// </summary>
/// <param name="handler">事务体 () => {}</param>
void Transaction(Action handler);
/// <summary>
/// 开启事务（不支持异步）
/// </summary>
/// <param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
/// <param name="handler">事务体 () => {}</param>
void Transaction(TimeSpan timeout, Action handler);
/// <summary>
/// 开启事务（不支持异步）
/// </summary>
/// <param name="isolationLevel"></param>
/// <param name="handler">事务体 () => {}</param>
/// <param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
void Transaction(IsolationLevel isolationLevel, TimeSpan timeout, Action handler);
void Transaction(IsolationLevel isolationLevel, Action handler);
/// <summary>
/// 当前线程的事务
/// </summary>

15
FreeSql/Interface/IFreeSql.cs
View File

@ -101,23 +101,18 @@ public interface IFreeSql : IDisposable
IDelete<T1> Delete<T1>(object dywhere) where T1 : class;
/// <summary>
/// 开启事务（不支持异步），60秒未执行完成（可能）被其他线程事务自动提交
/// 开启事务（不支持异步）<para></para>
/// v1.5.0 关闭了线程事务超时自动提交的机制
/// </summary>
/// <param name="handler">事务体 () => {}</param>
void Transaction(Action handler);
/// <summary>
/// 开启事务（不支持异步）
/// </summary>
/// <param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
/// <param name="handler">事务体 () => {}</param>
void Transaction(TimeSpan timeout, Action handler);
/// <summary>
/// 开启事务（不支持异步）
/// 开启事务（不支持异步）<para></para>
/// v1.5.0 关闭了线程事务超时自动提交的机制
/// </summary>
/// <param name="isolationLevel"></param>
/// <param name="handler">事务体 () => {}</param>
/// <param name="timeout">超时，未执行完成（可能）被其他线程事务自动提交</param>
void Transaction(IsolationLevel isolationLevel, TimeSpan timeout, Action handler);
void Transaction(IsolationLevel isolationLevel, Action handler);
/// <summary>
/// 数据库访问对象

13
FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderTransaction.cs
View File

@ -35,7 +35,7 @@ namespace FreeSql.Internal.CommonProvider
public DbTransaction TransactionCurrentThread => _trans.TryGetValue(Thread.CurrentThread.ManagedThreadId, out var conn) && conn.Transaction?.Connection != null ? conn.Transaction : null;
public Aop.TraceBeforeEventArgs TransactionCurrentThreadAopBefore => _trans.TryGetValue(Thread.CurrentThread.ManagedThreadId, out var conn) && conn.Transaction?.Connection != null ? conn.AopBefore : null;
public void BeginTransaction(TimeSpan timeout, IsolationLevel? isolationLevel)
public void BeginTransaction(IsolationLevel? isolationLevel)
{
if (TransactionCurrentThread != null) return;
@ -48,7 +48,7 @@ namespace FreeSql.Internal.CommonProvider
try
{
conn = MasterPool.Get();
tran = new Transaction2(conn, isolationLevel == null ? conn.Value.BeginTransaction() : conn.Value.BeginTransaction(isolationLevel.Value), timeout);
tran = new Transaction2(conn, isolationLevel == null ? conn.Value.BeginTransaction() : conn.Value.BeginTransaction(isolationLevel.Value), TimeSpan.FromSeconds(60));
tran.AopBefore = before;
}
catch (Exception ex)
@ -107,15 +107,14 @@ namespace FreeSql.Internal.CommonProvider
if (_trans.TryGetValue(Thread.CurrentThread.ManagedThreadId, out var tran)) CommitTransaction(false, tran, ex);
}
public void Transaction(Action handler) => TransactionInternal(null, TimeSpan.FromSeconds(60), handler);
public void Transaction(TimeSpan timeout, Action handler) => TransactionInternal(null, timeout, handler);
public void Transaction(IsolationLevel isolationLevel, TimeSpan timeout, Action handler) => TransactionInternal(isolationLevel, timeout, handler);
public void Transaction(Action handler) => TransactionInternal(null, handler);
public void Transaction(IsolationLevel isolationLevel, Action handler) => TransactionInternal(isolationLevel, handler);
void TransactionInternal(IsolationLevel? isolationLevel, TimeSpan timeout, Action handler)
void TransactionInternal(IsolationLevel? isolationLevel, Action handler)
{
try
{
BeginTransaction(timeout, isolationLevel);
BeginTransaction(isolationLevel);
handler();
CommitTransaction();
}