Autotest
/
sharding
mirror of https://gitee.com/dotnetchina/sharding-core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化代码针对commit的提交判断

This commit is contained in:
xuejiaming 2022-10-20 13:18:55 +08:00
parent 5eebc2aba2
commit 9246b09b5a
7 changed files with 136 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/Sample.MySql/Controllers/WeatherForecastController.cs
View File

@ -65,7 +65,6 @@ namespace Sample.MySql.Controllers
// //一定要先在路由里面添加尾巴 // //一定要先在路由里面添加尾巴
// virtualTableRoute.Append("20220921"); // virtualTableRoute.Append("20220921");
// shardingTableCreator.CreateTable<SysUserMod>("ds0","20220921"); // shardingTableCreator.CreateTable<SysUserMod>("ds0","20220921");
return _defaultTableDbContext.Set<SysTest>(); return _defaultTableDbContext.Set<SysTest>();
} }
[HttpGet] [HttpGet]

20
src/ShardingCore/EFCores/RelationTransactions/ShardingRelationalTransaction.cs
View File

@ -92,13 +92,19 @@ namespace ShardingCore.EFCores
await _shardingDbContext.CommitAsync(cancellationToken); await _shardingDbContext.CommitAsync(cancellationToken);
_shardingDbContext.NotifyShardingTransaction(); _shardingDbContext.NotifyShardingTransaction();
} }
// #if !NETCOREAPP3_0 #if !NETCOREAPP3_0&&!NETSTANDARD2_0
// public override void CreateSavepoint(string name) // public override void CreateSavepoint(string name)
// { // {
// AAA // base.CreateSavepoint(name);
// base.CreateSavepoint(name); // _shardingDbContext.CreateSavepoint(name);
// } // }
// #endif //
// public override async Task CreateSavepointAsync(string name, CancellationToken cancellationToken = new CancellationToken())
// {
// await base.CreateSavepointAsync(name, cancellationToken);
// await _shardingDbContext.CreateSavepointAsync(name,cancellationToken);
// }
#endif
#endif #endif
} }
} }

9
src/ShardingCore/Sharding/Abstractions/IShardingDbContextExecutor.cs
View File

@ -91,6 +91,15 @@ namespace ShardingCore.Sharding.Abstractions
/// <param name="cancellationToken"></param> /// <param name="cancellationToken"></param>
/// <returns></returns> /// <returns></returns>
Task CommitAsync(CancellationToken cancellationToken = new CancellationToken()); Task CommitAsync(CancellationToken cancellationToken = new CancellationToken());
#if !NETCOREAPP3_0&&!NETSTANDARD2_0
// void CreateSavepoint(string name);
// Task CreateSavepointAsync(string name, CancellationToken cancellationToken = new CancellationToken());
// void RollbackToSavepoint(string name);
// Task RollbackToSavepointAsync(string name,CancellationToken cancellationToken = default(CancellationToken));
// void ReleaseSavepoint(string name);
// Task ReleaseSavepointAsync(string name, CancellationToken cancellationToken = default(CancellationToken));
#endif
#endif #endif
} }
} }

8
src/ShardingCore/Sharding/Abstractions/IShardingTransaction.cs
View File

@ -21,6 +21,14 @@ namespace ShardingCore.Sharding.Abstractions
#if !NETCOREAPP2_0 #if !NETCOREAPP2_0
Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken()); Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken());
Task CommitAsync(CancellationToken cancellationToken = new CancellationToken()); Task CommitAsync(CancellationToken cancellationToken = new CancellationToken());
#if !NETCOREAPP3_0 && !NETSTANDARD2_0
// void CreateSavepoint(string name);
// Task CreateSavepointAsync(string name, CancellationToken cancellationToken = new CancellationToken());
// void RollbackToSavepoint(string name);
// Task RollbackToSavepointAsync(string name,CancellationToken cancellationToken = default(CancellationToken));
// void ReleaseSavepoint(string name);
// Task ReleaseSavepointAsync(string name, CancellationToken cancellationToken = default(CancellationToken));
#endif
#endif #endif
} }
} }

116
src/ShardingCore/Sharding/ShardingDbContextExecutors/DataSourceDbContext.cs
View File

@ -18,7 +18,6 @@ using ShardingCore.Core.RuntimeContexts;
using ShardingCore.Exceptions; using ShardingCore.Exceptions;
using ShardingCore.Extensions; using ShardingCore.Extensions;
using ShardingCore.Infrastructures; using ShardingCore.Infrastructures;
using ShardingCore.Sharding.Abstractions; using ShardingCore.Sharding.Abstractions;
namespace ShardingCore.Sharding.ShardingDbContextExecutors namespace ShardingCore.Sharding.ShardingDbContextExecutors
@ -32,11 +31,10 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
*/ */
public class DataSourceDbContext : IDataSourceDbContext public class DataSourceDbContext : IDataSourceDbContext
{ {
private static readonly IComparer<string> _comparer = new NoShardingFirstComparer(); private static readonly IComparer<string> _comparer = new NoShardingFirstComparer();
private readonly ILogger<DataSourceDbContext> _logger;
public Type DbContextType { get; } public Type DbContextType { get; }
/// <summary> /// <summary>
/// 当前是否是默认的dbcontext 也就是不分片的dbcontext /// 当前是否是默认的dbcontext 也就是不分片的dbcontext
/// </summary> /// </summary>
@ -82,6 +80,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
/// shell dbcontext最外面的壳 /// shell dbcontext最外面的壳
/// </summary> /// </summary>
private readonly DbContext _shardingShellDbContext; private readonly DbContext _shardingShellDbContext;
private readonly IShardingRuntimeContext _shardingRuntimeContext; private readonly IShardingRuntimeContext _shardingRuntimeContext;
/// <summary> /// <summary>
@ -117,8 +116,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
bool isDefault, bool isDefault,
DbContext shardingShellDbContext, DbContext shardingShellDbContext,
IDbContextCreator dbContextCreator, IDbContextCreator dbContextCreator,
ActualConnectionStringManager actualConnectionStringManager, ActualConnectionStringManager actualConnectionStringManager)
ILogger<DataSourceDbContext> logger)
{ {
var shardingDbContext = (IShardingDbContext)shardingShellDbContext; var shardingDbContext = (IShardingDbContext)shardingShellDbContext;
DataSourceName = dataSourceName; DataSourceName = dataSourceName;
@ -126,11 +124,10 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
_shardingShellDbContext = shardingShellDbContext; _shardingShellDbContext = shardingShellDbContext;
_shardingRuntimeContext = shardingShellDbContext.GetShardingRuntimeContext(); _shardingRuntimeContext = shardingShellDbContext.GetShardingRuntimeContext();
DbContextType = shardingShellDbContext.GetType(); DbContextType = shardingShellDbContext.GetType();
_virtualDataSource =shardingDbContext _virtualDataSource = shardingDbContext
.GetVirtualDataSource(); .GetVirtualDataSource();
_dbContextCreator = dbContextCreator; _dbContextCreator = dbContextCreator;
_actualConnectionStringManager = actualConnectionStringManager; _actualConnectionStringManager = actualConnectionStringManager;
this._logger = logger;
} }
/// <summary> /// <summary>
@ -155,7 +152,8 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
{ {
//先创建dbcontext option builder //先创建dbcontext option builder
var dbContextOptionBuilderCreator = _shardingRuntimeContext.GetDbContextOptionBuilderCreator(); var dbContextOptionBuilderCreator = _shardingRuntimeContext.GetDbContextOptionBuilderCreator();
var dbContextOptionsBuilder = dbContextOptionBuilderCreator.CreateDbContextOptionBuilder().UseShardingOptions(_shardingRuntimeContext); var dbContextOptionsBuilder = dbContextOptionBuilderCreator.CreateDbContextOptionBuilder()
.UseShardingOptions(_shardingRuntimeContext);
if (IsDefault) if (IsDefault)
{ {
@ -342,34 +340,17 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
{ {
if (IsDefault) if (IsDefault)
return; return;
try CurrentDbContextTransaction?.Rollback();
{
CurrentDbContextTransaction?.Rollback();
}
catch (Exception e)
{
_logger.LogError(e, "rollback error.");
}
} }
/// <summary> /// <summary>
/// 提交数据 /// 提交数据
/// </summary> /// </summary>
/// <param name="dataSourceCount">如果只有一个数据源那么就直接报错否则就忽略</param> public void Commit()
public void Commit(int dataSourceCount)
{ {
if (IsDefault) if (IsDefault)
return; return;
try CurrentDbContextTransaction?.Commit();
{
CurrentDbContextTransaction?.Commit();
}
catch (Exception e)
{
_logger.LogError(e, "commit error.");
if (dataSourceCount == 1)
throw;
}
} }
#if !NETCOREAPP2_0 #if !NETCOREAPP2_0
public async Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken()) public async Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken())
@ -377,35 +358,70 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
if (IsDefault) if (IsDefault)
return; return;
try if (CurrentDbContextTransaction != null)
{ await CurrentDbContextTransaction.RollbackAsync(cancellationToken);
if (CurrentDbContextTransaction != null)
await CurrentDbContextTransaction.RollbackAsync(cancellationToken);
}
catch (Exception e)
{
_logger.LogError(e, "rollback error.");
}
} }
public async Task CommitAsync(int dataSourceCount, CancellationToken cancellationToken = public async Task CommitAsync(CancellationToken cancellationToken =
new CancellationToken()) new CancellationToken())
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
if (IsDefault) if (IsDefault)
return; return;
try if (CurrentDbContextTransaction != null)
{ await CurrentDbContextTransaction.CommitAsync(cancellationToken);
if (CurrentDbContextTransaction != null)
await CurrentDbContextTransaction.CommitAsync(cancellationToken);
}
catch (Exception e)
{
_logger.LogError(e, "commit error.");
if (dataSourceCount == 1)
throw;
}
} }
#if !NETCOREAPP3_0&&!NETSTANDARD2_0
// public void CreateSavepoint(string name)
// {
// if (IsDefault)
// return;
// CurrentDbContextTransaction?.CreateSavepoint(name);
// }
//
// public async Task CreateSavepointAsync(string name,
// CancellationToken cancellationToken = new CancellationToken())
// {
// cancellationToken.ThrowIfCancellationRequested();
// if (IsDefault)
// return;
// if (CurrentDbContextTransaction != null)
// await CurrentDbContextTransaction.CreateSavepointAsync(name, cancellationToken);
// }
//
// public void RollbackToSavepoint(string name)
// {
// if (IsDefault)
// return;
// CurrentDbContextTransaction?.RollbackToSavepoint(name);
// }
//
// public async Task RollbackToSavepointAsync(string name,
// CancellationToken cancellationToken = default(CancellationToken))
// {
// cancellationToken.ThrowIfCancellationRequested();
// if (IsDefault)
// return;
// if (CurrentDbContextTransaction != null)
// await CurrentDbContextTransaction.RollbackToSavepointAsync(name, cancellationToken);
// }
//
// public void ReleaseSavepoint(string name)
// {
// if (IsDefault)
// return;
// CurrentDbContextTransaction?.ReleaseSavepoint(name);
// }
//
// public async Task ReleaseSavepointAsync(string name, CancellationToken cancellationToken = default(CancellationToken))
// {
// cancellationToken.ThrowIfCancellationRequested();
// if (IsDefault)
// return;
// if (CurrentDbContextTransaction != null)
// await CurrentDbContextTransaction.ReleaseSavepointAsync(name, cancellationToken);
// }
#endif
#endif #endif
public void Dispose() public void Dispose()

12
src/ShardingCore/Sharding/ShardingDbContextExecutors/IDataSourceDbContext.cs
View File

@ -45,10 +45,18 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
IDictionary<string, DbContext> GetCurrentContexts(); IDictionary<string, DbContext> GetCurrentContexts();
void Rollback(); void Rollback();
void Commit(int dataSourceCount); void Commit();
#if !NETCOREAPP2_0 #if !NETCOREAPP2_0
Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken()); Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken());
Task CommitAsync(int dataSourceCount,CancellationToken cancellationToken = new CancellationToken()); Task CommitAsync(CancellationToken cancellationToken = new CancellationToken());
#if !NETCOREAPP3_0&&!NETSTANDARD2_0
// void CreateSavepoint(string name);
// Task CreateSavepointAsync(string name, CancellationToken cancellationToken = new CancellationToken());
// void RollbackToSavepoint(string name);
// Task RollbackToSavepointAsync(string name,CancellationToken cancellationToken = default(CancellationToken));
// void ReleaseSavepoint(string name);
// Task ReleaseSavepointAsync(string name, CancellationToken cancellationToken = default(CancellationToken));
#endif
#endif #endif
} }

33
src/ShardingCore/Sharding/ShardingDbContextExecutors/ShardingDbContextExecutor.cs
View File

@ -34,7 +34,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
/// <typeparam name="TShardingDbContext"></typeparam> /// <typeparam name="TShardingDbContext"></typeparam>
public class ShardingDbContextExecutor : IShardingDbContextExecutor public class ShardingDbContextExecutor : IShardingDbContextExecutor
{ {
private readonly ILoggerFactory _loggerFactory; private readonly ILogger<ShardingDbContextExecutor> _logger;
private readonly DbContext _shardingDbContext; private readonly DbContext _shardingDbContext;
//private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, DbContext>> _dbContextCaches = new ConcurrentDictionary<string, ConcurrentDictionary<string, DbContext>>(); //private readonly ConcurrentDictionary<string, ConcurrentDictionary<string, DbContext>> _dbContextCaches = new ConcurrentDictionary<string, ConcurrentDictionary<string, DbContext>>();
@ -78,7 +78,8 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
_routeTailFactory = _shardingRuntimeContext.GetRouteTailFactory(); _routeTailFactory = _shardingRuntimeContext.GetRouteTailFactory();
var shardingReadWriteManager = _shardingRuntimeContext.GetShardingReadWriteManager(); var shardingReadWriteManager = _shardingRuntimeContext.GetShardingReadWriteManager();
var shardingProvider = _shardingRuntimeContext.GetShardingProvider(); var shardingProvider = _shardingRuntimeContext.GetShardingProvider();
_loggerFactory=shardingProvider.GetService<ILoggerFactory>(); var loggerFactory=shardingProvider.GetRequiredService<ILoggerFactory>();
_logger=loggerFactory.CreateLogger<ShardingDbContextExecutor>();
_actualConnectionStringManager = new ActualConnectionStringManager(shardingReadWriteManager,_virtualDataSource); _actualConnectionStringManager = new ActualConnectionStringManager(shardingReadWriteManager,_virtualDataSource);
} }
@ -86,7 +87,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
private IDataSourceDbContext GetDataSourceDbContext(string dataSourceName) private IDataSourceDbContext GetDataSourceDbContext(string dataSourceName)
{ {
return _dbContextCaches.GetOrAdd(dataSourceName, dsname => new DataSourceDbContext(dsname, _virtualDataSource.IsDefault(dsname), _shardingDbContext, _dbContextCreator, _actualConnectionStringManager,_loggerFactory.CreateLogger<DataSourceDbContext>())); return _dbContextCaches.GetOrAdd(dataSourceName, dsname => new DataSourceDbContext(dsname, _virtualDataSource.IsDefault(dsname), _shardingDbContext, _dbContextCreator, _actualConnectionStringManager));
} }
/// <summary> /// <summary>
@ -194,9 +195,20 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
public void Commit() public void Commit()
{ {
int i = 0;
foreach (var dbContextCache in _dbContextCaches) foreach (var dbContextCache in _dbContextCaches)
{ {
dbContextCache.Value.Commit(_dbContextCaches.Count); try
{
dbContextCache.Value.Commit();
}
catch (Exception e)
{
_logger.LogError(e, "commit error.");
if (i == 0)
throw;
}
i++;
} }
AutoUseWriteConnectionString(); AutoUseWriteConnectionString();
@ -231,9 +243,20 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
public async Task CommitAsync(CancellationToken cancellationToken = new CancellationToken()) public async Task CommitAsync(CancellationToken cancellationToken = new CancellationToken())
{ {
int i = 0;
foreach (var dbContextCache in _dbContextCaches) foreach (var dbContextCache in _dbContextCaches)
{ {
await dbContextCache.Value.CommitAsync(_dbContextCaches.Count, cancellationToken); try
{
await dbContextCache.Value.CommitAsync(cancellationToken);
}
catch (Exception e)
{
_logger.LogError(e, "commit error.");
if (i == 0)
throw;
}
i++;
} }
AutoUseWriteConnectionString(); AutoUseWriteConnectionString();