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

移除不需要的代码,优化表达式解析

This commit is contained in:
xuejiaming 2022-07-18 23:08:48 +08:00
parent 84326c2552
commit 703bf84396
11 changed files with 667 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/Sample.AutoCreateIfPresent/Program.cs
View File

@ -5,6 +5,8 @@ using ShardingCore.Bootstrappers;
using ShardingCore.TableExists;
using ShardingCore.TableExists.Abstractions;
var join = string.Join(Environment.NewLine,Enumerable.Range(14,100).Select(o=>o+";"));
ILoggerFactory efLogger = LoggerFactory.Create(builder =>
{
builder.AddFilter((category, level) => category == DbLoggerCategory.Database.Command.Name && level == LogLevel.Information).AddConsole();
@ -19,12 +21,12 @@ builder.Services.AddControllers();
// builder.Services.AddEndpointsApiExplorer();
// builder.Services.AddSwaggerGen();
builder.Services.AddShardingDbContext<DefaultDbContext>()
.AddEntityConfig(o =>
.UseRouteConfig(o =>
{
o.AddShardingTableRoute<OrderByHourRoute>();
o.AddShardingTableRoute<AreaDeviceRoute>();
})
.AddConfig(o =>
.UseConfig(o =>
{
o.ThrowIfQueryRouteNotMatch = false;
o.AddDefaultDataSource("ds0", "server=127.0.0.1;port=3306;database=shardingTest;userid=root;password=root;");
@ -36,7 +38,7 @@ builder.Services.AddShardingDbContext<DefaultDbContext>()
{
b.UseMySql(conn, new MySqlServerVersion(new Version())).UseLoggerFactory(efLogger);
});
}).ReplaceService<ITableEnsureManager,MySqlTableEnsureManager>().EnsureConfig();
}).ReplaceService<ITableEnsureManager,MySqlTableEnsureManager>().AddShardingCore();
var app = builder.Build();
// Configure the HTTP request pipeline.

49
src/ShardingCore/Sharding/MergeEngines/FirstAsyncInMemoryMergeEngine.cs
View File

@ -1,49 +0,0 @@
using Microsoft.EntityFrameworkCore;
using ShardingCore.Extensions;
using ShardingCore.Sharding.Abstractions;
using ShardingCore.Sharding.MergeEngines.Abstractions.InMemoryMerge;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using ShardingCore.Helpers;
using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
using ShardingCore.Sharding.MergeEngines.Executors.Methods;
namespace ShardingCore.Sharding.StreamMergeEngines
{
/*
* @Author: xjm
* @Description:
* @Date: 2021/8/18 14:11:31
* @Ver: 1.0
* @Email: 326308290@qq.com
*/
internal class FirstAsyncInMemoryMergeEngine<TEntity> : AbstractTrackEnsureMethodCallWhereInMemoryAsyncMergeEngine<TEntity>
{
public FirstAsyncInMemoryMergeEngine(StreamMergeContext streamMergeContext) : base(streamMergeContext)
{
}
protected override IExecutor<RouteQueryResult<TEntity>> CreateExecutor0(bool async)
{
return new FirstMethodExecutor<TEntity>(GetStreamMergeContext());
}
protected override TEntity DoMergeResult0(List<RouteQueryResult<TEntity>> resultList)
{
var notNullResult = resultList.Where(o => o.HasQueryResult()).Select(o => o.QueryResult).ToList();
if (notNullResult.IsEmpty())
throw new InvalidOperationException("Sequence contains no elements.");
var streamMergeContext = GetStreamMergeContext();
if (streamMergeContext.Orders.Any())
return notNullResult.AsQueryable().OrderWithExpression(streamMergeContext.Orders, streamMergeContext.GetShardingComparer()).First();
return notNullResult.First();
}
}
}

45
src/ShardingCore/Sharding/MergeEngines/FirstOrDefaultAsyncInMemoryMergeEngine.cs
View File

@ -1,45 +0,0 @@
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
using ShardingCore.Extensions;
using ShardingCore.Sharding.Abstractions;
using ShardingCore.Sharding.MergeEngines.Abstractions.InMemoryMerge;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
using ShardingCore.Sharding.MergeEngines.Executors.Methods;
namespace ShardingCore.Sharding.StreamMergeEngines
{
/*
* @Author: xjm
* @Description:
* @Date: 2021/8/17 15:16:36
* @Ver: 1.0
* @Email: 326308290@qq.com
*/
internal class FirstOrDefaultAsyncInMemoryMergeEngine<TEntity> : AbstractTrackEnsureMethodCallWhereInMemoryAsyncMergeEngine<TEntity>
{
public FirstOrDefaultAsyncInMemoryMergeEngine(StreamMergeContext streamMergeContext) : base(streamMergeContext)
{
}
protected override IExecutor<RouteQueryResult<TEntity>> CreateExecutor0(bool async)
{
return new FirstOrDefaultMethodExecutor<TEntity>(GetStreamMergeContext());
}
protected override TEntity DoMergeResult0(List<RouteQueryResult<TEntity>> resultList)
{
var notNullResult = resultList.Where(o => o != null && o.HasQueryResult()).Select(o => o.QueryResult).ToList();
if (notNullResult.IsEmpty())
return default;
var streamMergeContext = GetStreamMergeContext();
if (streamMergeContext.Orders.Any())
return notNullResult.AsQueryable().OrderWithExpression(streamMergeContext.Orders, streamMergeContext.GetShardingComparer()).FirstOrDefault();
return notNullResult.FirstOrDefault();
}
}
}

65
src/ShardingCore/Sharding/MergeEngines/LastAsyncInMemoryMergeEngine.cs
View File

@ -1,65 +0,0 @@
using Microsoft.EntityFrameworkCore;
using ShardingCore.Extensions;
using ShardingCore.Sharding.Abstractions;
using ShardingCore.Sharding.MergeEngines.Abstractions.InMemoryMerge;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
using ShardingCore.Sharding.MergeEngines.Executors.Methods;
namespace ShardingCore.Sharding.StreamMergeEngines
{
/*
* @Author: xjm
* @Description:
* @Date: 2021/8/18 14:22:07
* @Ver: 1.0
* @Email: 326308290@qq.com
*/
internal class LastAsyncInMemoryMergeEngine<TEntity> : AbstractTrackEnsureMethodCallWhereInMemoryAsyncMergeEngine<TEntity>
{
public LastAsyncInMemoryMergeEngine(StreamMergeContext streamMergeContext) : base(streamMergeContext)
{
}
//public override async Task<TEntity> DoMergeResultAsync(CancellationToken cancellationToken = new CancellationToken())
//{
// var result = await base.ExecuteAsync( queryable => ((IQueryable<TEntity>)queryable).LastOrDefaultAsync(cancellationToken), cancellationToken);
// var notNullResult = result.Where(o => o != null&&o.QueryResult!=null).Select(o=>o.QueryResult).ToList();
// if (notNullResult.IsEmpty())
// throw new InvalidOperationException("Sequence contains no elements.");
// var streamMergeContext = GetStreamMergeContext();
// if (streamMergeContext.Orders.Any())
// return notNullResult.AsQueryable().OrderWithExpression(streamMergeContext.Orders, streamMergeContext.GetShardingComparer()).Last();
// return notNullResult.Last();
//}
//protected override IParallelExecuteControl<TResult> CreateParallelExecuteControl<TResult>(IParallelExecutor<TResult> executor)
//{
// return AnyElementParallelExecuteControl<TResult>.Create(GetStreamMergeContext(),executor);
//}
protected override IExecutor<RouteQueryResult<TEntity>> CreateExecutor0(bool async)
{
return new LastMethodExecutor<TEntity>(GetStreamMergeContext());
}
protected override TEntity DoMergeResult0(List<RouteQueryResult<TEntity>> resultList)
{
var notNullResult = resultList.Where(o => o != null && o.HasQueryResult()).Select(o => o.QueryResult).ToList();
if (notNullResult.IsEmpty())
throw new InvalidOperationException("Sequence contains no elements.");
var streamMergeContext = GetStreamMergeContext();
if (streamMergeContext.Orders.Any())
return notNullResult.AsQueryable().OrderWithExpression(streamMergeContext.Orders, streamMergeContext.GetShardingComparer()).Last();
return notNullResult.Last();
}
}
}

66
src/ShardingCore/Sharding/MergeEngines/LastOrDefaultAsyncInMemoryMergeEngine.cs
View File

@ -1,66 +0,0 @@
using System.Collections.Generic;
using Microsoft.EntityFrameworkCore;
using ShardingCore.Extensions;
using ShardingCore.Sharding.Abstractions;
using ShardingCore.Sharding.MergeEngines.Abstractions.InMemoryMerge;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
using ShardingCore.Sharding.MergeEngines.Executors.Methods;
namespace ShardingCore.Sharding.StreamMergeEngines
{
/*
* @Author: xjm
* @Description:
* @Date: 2021/8/18 14:23:13
* @Ver: 1.0
* @Email: 326308290@qq.com
*/
internal class LastOrDefaultAsyncInMemoryMergeEngine<TEntity> : AbstractTrackEnsureMethodCallWhereInMemoryAsyncMergeEngine<TEntity>
{
public LastOrDefaultAsyncInMemoryMergeEngine(StreamMergeContext streamMergeContext) : base(streamMergeContext)
{
}
//public override async Task<TEntity> DoMergeResultAsync(CancellationToken cancellationToken = new CancellationToken())
//{
// var result = await base.ExecuteAsync( queryable => ((IQueryable<TEntity>)queryable).LastOrDefaultAsync(cancellationToken), cancellationToken);
// var notNullResult = result.Where(o => o != null&&o.QueryResult!=null).Select(o=>o.QueryResult).ToList();
// if (notNullResult.IsEmpty())
// return default;
// var streamMergeContext = GetStreamMergeContext();
// if (streamMergeContext.Orders.Any())
// return notNullResult.AsQueryable().OrderWithExpression(streamMergeContext.Orders, streamMergeContext.GetShardingComparer()).LastOrDefault();
// return notNullResult.LastOrDefault();
//}
//protected override IParallelExecuteControl<TResult> CreateParallelExecuteControl<TResult>(IParallelExecutor<TResult> executor)
//{
// return AnyElementParallelExecuteControl<TResult>.Create(GetStreamMergeContext(),executor);
//}
protected override IExecutor<RouteQueryResult<TEntity>> CreateExecutor0(bool async)
{
return new LastOrDefaultMethodExecutor<TEntity>(GetStreamMergeContext());
}
protected override TEntity DoMergeResult0(List<RouteQueryResult<TEntity>> resultList)
{
var notNullResult = resultList.Where(o => o != null && o.HasQueryResult()).Select(o => o.QueryResult).ToList();
if (notNullResult.IsEmpty())
return default;
var streamMergeContext = GetStreamMergeContext();
if (streamMergeContext.Orders.Any())
return notNullResult.AsQueryable().OrderWithExpression(streamMergeContext.Orders, streamMergeContext.GetShardingComparer()).LastOrDefault();
return notNullResult.LastOrDefault();
}
}
}

62
src/ShardingCore/Sharding/MergeEngines/SingleAsyncInMemoryMergeEngine.cs
View File

@ -1,62 +0,0 @@
using Microsoft.EntityFrameworkCore;
using ShardingCore.Sharding.Abstractions;
using ShardingCore.Sharding.MergeEngines.Abstractions.InMemoryMerge;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
using ShardingCore.Sharding.MergeEngines.Executors.Methods;
namespace ShardingCore.Sharding.StreamMergeEngines
{
/*
* @Author: xjm
* @Description:
* @Date: 2021/8/18 14:25:12
* @Ver: 1.0
* @Email: 326308290@qq.com
*/
internal class SingleAsyncInMemoryMergeEngine<TEntity> : AbstractTrackEnsureMethodCallWhereInMemoryAsyncMergeEngine<TEntity>
{
public SingleAsyncInMemoryMergeEngine(StreamMergeContext streamMergeContext) : base(streamMergeContext)
{
}
//public override async Task<TEntity> DoMergeResultAsync(CancellationToken cancellationToken = new CancellationToken())
//{
// var result = await base.ExecuteAsync( queryable => ((IQueryable<TEntity>)queryable).SingleOrDefaultAsync(cancellationToken), cancellationToken);
// var notNullResult = result.Where(o => o != null&&o.QueryResult!=null).Select(o=>o.QueryResult).ToList();
// if (notNullResult.Count==0)
// throw new InvalidOperationException("Sequence on element.");
// if (notNullResult.Count!=1)
// throw new InvalidOperationException("Sequence contains more than one element.");
// return notNullResult.Single();
//}
//protected override IParallelExecuteControl<TResult> CreateParallelExecuteControl<TResult>(IParallelExecutor<TResult> executor)
//{
// return SingleOrSingleOrDefaultParallelExecuteControl<TResult>.Create(GetStreamMergeContext(), executor);
//}
protected override IExecutor<RouteQueryResult<TEntity>> CreateExecutor0(bool async)
{
return new SingleMethodExecutor<TEntity>(GetStreamMergeContext());
}
protected override TEntity DoMergeResult0(List<RouteQueryResult<TEntity>> resultList)
{
var notNullResult = resultList.Where(o => o != null && o.HasQueryResult()).Select(o => o.QueryResult).ToList();
if (notNullResult.Count == 0)
throw new InvalidOperationException("Sequence on element.");
if (notNullResult.Count != 1)
throw new InvalidOperationException("Sequence contains more than one element.");
return notNullResult.Single();
}
}
}

42
src/ShardingCore/Sharding/MergeEngines/SingleOrDefaultAsyncInMemoryMergeEngine.cs
View File

@ -1,42 +0,0 @@
using Microsoft.EntityFrameworkCore;
using ShardingCore.Extensions;
using ShardingCore.Sharding.Abstractions;
using ShardingCore.Sharding.MergeEngines.Abstractions.InMemoryMerge;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
using ShardingCore.Sharding.MergeEngines.Executors.Methods;
namespace ShardingCore.Sharding.StreamMergeEngines
{
/*
* @Author: xjm
* @Description:
* @Date: 2021/8/18 14:26:40
* @Ver: 1.0
* @Email: 326308290@qq.com
*/
internal class SingleOrDefaultAsyncInMemoryMergeEngine<TEntity> : AbstractTrackEnsureMethodCallWhereInMemoryAsyncMergeEngine<TEntity>
{
public SingleOrDefaultAsyncInMemoryMergeEngine(StreamMergeContext streamMergeContext) : base(streamMergeContext)
{
}
protected override IExecutor<RouteQueryResult<TEntity>> CreateExecutor0(bool async)
{
return new SingleOrDefaultMethodExecutor<TEntity>(GetStreamMergeContext());
}
protected override TEntity DoMergeResult0(List<RouteQueryResult<TEntity>> resultList)
{
var notNullResult = resultList.Where(o => o != null && o.HasQueryResult()).Select(o => o.QueryResult).ToList();
if (notNullResult.Count > 1)
throw new InvalidOperationException("Sequence contains more than one element.");
return notNullResult.SingleOrDefault();
}
}
}

634
src/ShardingCore/Sharding/Visitors/QueryableRouteDiscoverVisitorV2.cs Normal file
View File

@ -0,0 +1,634 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query;
using ShardingCore.Core.EntityMetadatas;
using ShardingCore.Core.VirtualDatabase;
using ShardingCore.Core.VirtualRoutes;
using ShardingCore.Exceptions;
using ShardingCore.Extensions;
using ShardingCore.Sharding.Visitors;
namespace ShardingCore.Core.Internal.Visitors
{
/*
* @Author: xjm
* @Description:
* @Date: Monday, 28 December 2020 22:09:39
* @Email: 326308290@qq.com
*/
public class QueryableRouteShardingTableDiscoverVisitorV2 : ShardingExpressionVisitor
{
private readonly EntityMetadata _entityMetadata;
private readonly Func<object, ShardingOperatorEnum, string, Func<string, bool>> _keyToTailWithFilter;
/// <summary>
/// 是否是分表路由
/// </summary>
private readonly bool _shardingTableRoute;
private LambdaExpression _entityLambdaExpression;
private readonly ShardingPredicateResult _noShardingPredicateResult = new ShardingPredicateResult(false, null);
private bool isIgnoreQueryFilter;
private RoutePredicateExpression _where = RoutePredicateExpression.Default;
public QueryableRouteShardingTableDiscoverVisitorV2(EntityMetadata entityMetadata,
Func<object, ShardingOperatorEnum, string, Func<string, bool>> keyToTailWithFilter, bool shardingTableRoute)
{
_entityMetadata = entityMetadata;
_keyToTailWithFilter = keyToTailWithFilter;
_shardingTableRoute = shardingTableRoute;
}
/// <summary>
/// 获取路由表达式
/// </summary>
/// <returns></returns>
public RoutePredicateExpression GetRouteParseExpression()
{
if (_entityMetadata.QueryFilterExpression != null && !isIgnoreQueryFilter)
{
if (_entityLambdaExpression == null)
{
_entityLambdaExpression = _entityMetadata.QueryFilterExpression;
}
else
{
var body = Expression.AndAlso(_entityLambdaExpression.Body,
_entityMetadata.QueryFilterExpression.Body);
_entityLambdaExpression = Expression.Lambda(body, _entityLambdaExpression.Parameters[0]);
}
}
if (_entityLambdaExpression != null)
{
var newWhere = Resolve(_entityLambdaExpression);
_where = _where.And(newWhere);
}
return _where;
}
private bool IsShardingKey(Expression expression, out ShardingPredicateResult shardingPredicateResult)
{
if (expression is MemberExpression member)
{
if (member.Expression?.Type == _entityMetadata.EntityType ||
MemberExpressionIsConvertAndOriginalIsEntityType(member))
{
var isShardingKey = false;
if (_shardingTableRoute)
{
isShardingKey = _entityMetadata.ShardingTableProperties.ContainsKey(member.Member.Name);
}
else
{
isShardingKey = _entityMetadata.ShardingDataSourceProperties.ContainsKey(member.Member.Name);
}
if (isShardingKey)
{
shardingPredicateResult = new ShardingPredicateResult(true, member.Member.Name);
return true;
}
}
}
shardingPredicateResult = _noShardingPredicateResult;
return false;
}
/// <summary>
/// 成员表达式是强转并且强转前的类型是当前对象
/// </summary>
/// <param name="member"></param>
/// <returns></returns>
private bool MemberExpressionIsConvertAndOriginalIsEntityType(MemberExpression member)
{
return member.Expression?.NodeType == ExpressionType.Convert &&
member.Expression is UnaryExpression unaryExpression &&
unaryExpression.Operand.Type == _entityMetadata.EntityType;
}
/// <summary>
/// 方法是否包含shardingKey xxx.invoke(shardingkey) eg. <code>o=>new[]{}.Contains(o.Id)</code>
/// </summary>
/// <param name="methodCallExpression"></param>
/// <returns></returns>
private ShardingPredicateResult IsMethodWrapShardingKey(MethodCallExpression methodCallExpression)
{
if (methodCallExpression.Arguments.IsNotEmpty())
{
for (int i = 0; i < methodCallExpression.Arguments.Count; i++)
{
if (IsShardingKey(methodCallExpression.Arguments[i], out var result))
return result;
}
}
return _noShardingPredicateResult;
}
private ShardingPredicateResult IsShardingWrapConstant(MethodCallExpression methodCallExpression)
{
if (methodCallExpression.Object != null)
{
if (IsShardingKey(methodCallExpression.Object, out var result))
{
return result;
}
}
return _noShardingPredicateResult;
}
/// <summary>
/// 表达式是否可以获取值
/// </summary>
/// <param name="expression"></param>
/// <returns></returns>
private bool ExpressionCanGetValue(Expression expression)
{
return expression is ConstantExpression
|| (expression is MemberExpression member && (member.Expression is ConstantExpression ||
member.Expression is MemberExpression ||
member.Expression is MemberExpression))
|| expression is MethodCallExpression
|| (expression is UnaryExpression unaryExpression &&
unaryExpression.NodeType is ExpressionType.Convert);
}
private bool IsMethodCall(Expression expression)
{
return expression is MethodCallExpression;
}
protected override Expression VisitMethodCall(MethodCallExpression node)
{
switch (node.Method.Name)
{
case nameof(EntityFrameworkQueryableExtensions.IgnoreQueryFilters):
isIgnoreQueryFilter = true;
break;
case nameof(Queryable.Where):
CombineEntityLambdaExpression(node);
break;
}
return base.VisitMethodCall(node);
}
private void CombineEntityLambdaExpression(MethodCallExpression node)
{
if (node.Arguments[1] is UnaryExpression unaryExpression)
{
if (unaryExpression.Operand is LambdaExpression lambdaExpression)
{
if (lambdaExpression.Parameters[0].Type == _entityMetadata.EntityType)
{
if (_entityLambdaExpression == null)
{
_entityLambdaExpression = lambdaExpression;
}
else
{
var body = Expression.AndAlso(_entityLambdaExpression.Body, lambdaExpression.Body);
var lambda = Expression.Lambda(body, _entityLambdaExpression.Parameters[0]);
_entityLambdaExpression = lambda;
}
}
}
}
}
private RoutePredicateExpression Resolve(Expression expression)
{
if (expression is LambdaExpression lambda)
{
expression = lambda.Body;
return Resolve(expression);
}
//解析左右结构属性判断
if (expression is BinaryExpression binaryExpression) //解析二元运算符
{
return ParsePropertyCondition(binaryExpression);
}
if (expression is UnaryExpression unary) //解析一元运算符
{
if (unary.Operand is MethodCallExpression unaryCallExpression)
{
// return ResolveLinqToObject(unary.Operand, false);
return ResolveInFunc(unaryCallExpression, unary.NodeType != ExpressionType.Not);
}
}
if (expression is MethodCallExpression methodCallExpression) //解析方法
{
return ResolveInFunc(methodCallExpression, true);
}
return RoutePredicateExpression.Default;
}
private RoutePredicateExpression ResolveInFunc(MethodCallExpression methodCallExpression, bool @in)
{
if (methodCallExpression.IsEnumerableContains(methodCallExpression.Method.Name))
{
var shardingPredicateResult = IsMethodWrapShardingKey(methodCallExpression);
if (shardingPredicateResult.IsShardingKey)
{
object arrayObject = null;
if (methodCallExpression.Object != null)
{
if (methodCallExpression.Object is MemberExpression member1Expression)
{
arrayObject = GetExpressionValue(member1Expression);
}
else if (methodCallExpression.Object is ListInitExpression member2Expression)
{
arrayObject = GetExpressionValue(member2Expression);
}
}
else if (methodCallExpression.Arguments[0] is MemberExpression member2Expression)
{
arrayObject = GetExpressionValue(member2Expression);
}
else if (methodCallExpression.Arguments[0] is NewArrayExpression member3Expression)
{
arrayObject = GetExpressionValue(member3Expression);
}
if (arrayObject != null)
{
var contains = @in ? RoutePredicateExpression.DefaultFalse : RoutePredicateExpression.Default;
if (arrayObject is IEnumerable enumerableObj)
{
foreach (var shardingValue in enumerableObj)
{
var eq = _keyToTailWithFilter(shardingValue,
@in ? ShardingOperatorEnum.Equal : ShardingOperatorEnum.NotEqual,
shardingPredicateResult.ShardingPropertyName);
if (@in)
contains = contains.Or(new RoutePredicateExpression(eq));
else
contains = contains.And(new RoutePredicateExpression(eq));
}
}
return contains;
}
}
}
if (methodCallExpression.IsNamedEquals())
{
//"".equals(o.id)
var shardingPredicateResult = IsMethodWrapShardingKey(methodCallExpression);
if (shardingPredicateResult.IsShardingKey)
{
var shardingValue = GetExpressionValue(methodCallExpression.Object);
if (shardingValue != null)
{
var keyToTailWithFilter = _keyToTailWithFilter(shardingValue, ShardingOperatorEnum.Equal,
shardingPredicateResult.ShardingPropertyName);
return new RoutePredicateExpression(keyToTailWithFilter);
}
}
else
{
//o.id.equals("")
shardingPredicateResult = IsShardingWrapConstant(methodCallExpression);
if (shardingPredicateResult.IsShardingKey)
{
object shardingValue = default;
if (methodCallExpression.Arguments[0] is MemberExpression member2Expression)
{
shardingValue = GetExpressionValue(member2Expression);
}
else if (methodCallExpression.Arguments[0] is ConstantExpression constantExpression)
{
shardingValue = GetExpressionValue(constantExpression);
}
if (shardingValue != default)
{
var keyToTailWithFilter = _keyToTailWithFilter(shardingValue, ShardingOperatorEnum.Equal,
shardingPredicateResult.ShardingPropertyName);
return new RoutePredicateExpression(keyToTailWithFilter);
}
}
}
}
//if (methodCallExpression.IsNamedCompareOrdinal())
//{
//}
//var shardingKeyValue = GetShardingKeyValue(methodCallExpression);
return RoutePredicateExpression.Default;
}
private ShardingOperatorEnum GetParseCompareShardingOperatorEnum(bool conditionOnRight,
ExpressionType expressionType, int compare)
{
if (compare == 1)
{
return expressionType switch
{
ExpressionType.GreaterThanOrEqual => conditionOnRight
? ShardingOperatorEnum.GreaterThan
: ShardingOperatorEnum.LessThan, //1
ExpressionType.GreaterThan => ShardingOperatorEnum.UnKnown, //无
ExpressionType.LessThanOrEqual => ShardingOperatorEnum.UnKnown, //1,0,-1 = 无
ExpressionType.LessThan => conditionOnRight
? ShardingOperatorEnum.LessThanOrEqual
: ShardingOperatorEnum.GreaterThanOrEqual, //0,-1
ExpressionType.Equal => conditionOnRight
? ShardingOperatorEnum.GreaterThan
: ShardingOperatorEnum.LessThan, //1
ExpressionType.NotEqual => ShardingOperatorEnum.NotEqual,
_ => ShardingOperatorEnum.UnKnown
};
}
if (compare == 0)
{
return expressionType switch
{
ExpressionType.GreaterThanOrEqual => conditionOnRight
? ShardingOperatorEnum.GreaterThanOrEqual
: ShardingOperatorEnum.LessThanOrEqual, //0,1
ExpressionType.GreaterThan => conditionOnRight
? ShardingOperatorEnum.GreaterThan
: ShardingOperatorEnum.LessThan, //1
ExpressionType.LessThanOrEqual => conditionOnRight
? ShardingOperatorEnum.LessThanOrEqual
: ShardingOperatorEnum.GreaterThanOrEqual, //0,-1
ExpressionType.LessThan => conditionOnRight
? ShardingOperatorEnum.LessThan
: ShardingOperatorEnum.GreaterThan, //-1
ExpressionType.Equal => ShardingOperatorEnum.Equal,
ExpressionType.NotEqual => ShardingOperatorEnum.NotEqual,
_ => ShardingOperatorEnum.UnKnown
};
}
if (compare == -1)
{
return expressionType switch
{
ExpressionType.GreaterThanOrEqual => ShardingOperatorEnum.UnKnown, //-1,0,1
ExpressionType.GreaterThan => conditionOnRight
? ShardingOperatorEnum.GreaterThanOrEqual
: ShardingOperatorEnum.LessThanOrEqual, //0,1
ExpressionType.LessThanOrEqual => conditionOnRight
? ShardingOperatorEnum.LessThan
: ShardingOperatorEnum.GreaterThan, //-1
ExpressionType.LessThan => ShardingOperatorEnum.UnKnown, //无
ExpressionType.Equal => conditionOnRight
? ShardingOperatorEnum.LessThan
: ShardingOperatorEnum.GreaterThan, //1
ExpressionType.NotEqual => ShardingOperatorEnum.NotEqual,
_ => ShardingOperatorEnum.UnKnown
};
}
return ShardingOperatorEnum.UnKnown;
}
private RoutePredicateExpression ParseCompare(MethodCallExpression methodCallExpression, Expression left,
Expression right, ExpressionType expressionType, int compare)
{
if (left.Type == right.Type)
{
if (methodCallExpression.Method.ReturnType == typeof(int))
{
return ParseCondition0(left, right, expressionType,
(conditionOnRight, nodeType) =>
GetParseCompareShardingOperatorEnum(conditionOnRight, nodeType, compare));
}
}
return RoutePredicateExpression.Default;
}
private RoutePredicateExpression ParseConditionOnRight0(bool conditionOnRight,
ShardingPredicateResult predicateLeftResult,
Expression conditionExpression, ExpressionType expressionType)
{
if (ExpressionCanGetValue(conditionExpression))
{
var shardingPropertyName = predicateLeftResult.ShardingPropertyName;
var value = GetExpressionValue(conditionExpression);
if (shardingPropertyName == null || value == default)
return RoutePredicateExpression.Default;
var op = _shardingOperatorFunc(conditionOnRight, expressionType);
return new RoutePredicateExpression(_keyToTailWithFilter(value, op, shardingPropertyName));
}
else
return RoutePredicateExpression.Default;
}
private RoutePredicateExpression ParseCondition0(Expression left, Expression right,
ExpressionType expressionType, Func<bool, ExpressionType, ShardingOperatorEnum> shardingOperatorFunc)
{
if (IsShardingKey(left, out var predicateLeftResult))
{
return ParseConditionOnRight0(true, predicateLeftResult, right, expressionType);
}
else if (IsShardingKey(right, out var predicateRightResult))
{
return ParseConditionOnRight0(false, predicateRightResult, left, expressionType);
}
else
return RoutePredicateExpression.Default;
}
private RoutePredicateExpression ParseNamedComparison(BinaryExpression binaryExpression,MethodCallExpression methodCallExpression)
{
if (methodCallExpression.GetComparisonLeftAndRight(out var result))
{
return ParseCompare(methodCallExpression, result.Left, result.Right,
binaryExpression.NodeType, (int)GetExpressionValue(binaryExpression.Right));
}
return RoutePredicateExpression.Default;
}
private static readonly Func<bool, ExpressionType, ShardingOperatorEnum> _shardingOperatorFunc =
(conditionOnRight, nodeType) =>
{
var op = nodeType switch
{
ExpressionType.GreaterThan => conditionOnRight
? ShardingOperatorEnum.GreaterThan
: ShardingOperatorEnum.LessThan,
ExpressionType.GreaterThanOrEqual => conditionOnRight
? ShardingOperatorEnum.GreaterThanOrEqual
: ShardingOperatorEnum.LessThanOrEqual,
ExpressionType.LessThan => conditionOnRight
? ShardingOperatorEnum.LessThan
: ShardingOperatorEnum.GreaterThan,
ExpressionType.LessThanOrEqual => conditionOnRight
? ShardingOperatorEnum.LessThanOrEqual
: ShardingOperatorEnum.GreaterThanOrEqual,
ExpressionType.Equal => ShardingOperatorEnum.Equal,
ExpressionType.NotEqual => ShardingOperatorEnum.NotEqual,
_ => ShardingOperatorEnum.UnKnown
};
return op;
};
// private RoutePredicateExpression ParseGetWhere(BinaryExpression binaryExpression)
// {
// RoutePredicateExpression left = RoutePredicateExpression.Default;
// RoutePredicateExpression right = RoutePredicateExpression.Default;
//
// //递归获取
// if (binaryExpression.Left is BinaryExpression binaryExpression1)
// left = ParseGetWhere(binaryExpression1);
// if (binaryExpression.Right is BinaryExpression binaryExpression2)
// right = ParseGetWhere(binaryExpression2);
//
// if (binaryExpression.Left is MethodCallExpression methodCallLeftExpression)
// {
// if (!methodCallLeftExpression.IsNamedComparison())
// {
// left = Resolve(methodCallLeftExpression);
// }
// }
//
// if (binaryExpression.Right is MethodCallExpression methodCallRightExpression)
// {
// if (!methodCallRightExpression.IsNamedComparison())
// {
// right = Resolve(methodCallRightExpression);
// }
// }
//
// if (binaryExpression.Left is UnaryExpression unaryExpression1 && (binaryExpression.Right is MemberExpression&& !IsShardingKey(binaryExpression.Right, out var _)))
// left = Resolve(unaryExpression1);
// if (binaryExpression.Right is UnaryExpression unaryExpression2 && (binaryExpression.Left is MemberExpression && !IsShardingKey(binaryExpression.Left, out var _)))
// right = Resolve(unaryExpression2);
//
// //组合
// if (binaryExpression.NodeType == ExpressionType.AndAlso)
// {
// return left.And(right);
// }
// else if (binaryExpression.NodeType == ExpressionType.OrElse)
// {
// return left.Or(right);
// }
// //单个
// else
// {
// return ParseCondition(binaryExpression);
// }
// }
private RoutePredicateExpression ParsePropertyCondition(BinaryExpression binaryExpression)
{
// RoutePredicateExpression left = RoutePredicateExpression.Default;
// RoutePredicateExpression right = RoutePredicateExpression.Default;
//左边是属性判断是否是分片的
if (IsShardingKey(binaryExpression.Left, out var predicateLeftResult))
{
return ParseConditionOnRight0(true, predicateLeftResult, binaryExpression.Right,
binaryExpression.NodeType);
}
else if (IsShardingKey(binaryExpression.Right, out var predicateRightResult))
{
return ParseConditionOnRight0(false, predicateRightResult, binaryExpression.Left,
binaryExpression.NodeType);
} else if (binaryExpression.IsNamedComparison(out var methodCallExpression))
{
return ParseNamedComparison(binaryExpression, methodCallExpression);
}
else
{
RoutePredicateExpression left = RoutePredicateExpression.Default;
RoutePredicateExpression right = RoutePredicateExpression.Default;
//递归获取
if (binaryExpression.Left is BinaryExpression binaryExpression1)
left = ParsePropertyCondition(binaryExpression1);
if (binaryExpression.Right is BinaryExpression binaryExpression2)
right = ParsePropertyCondition(binaryExpression2);
if (binaryExpression.Left is MethodCallExpression methodCallLeftExpression)
{
if (!methodCallLeftExpression.IsNamedComparison())
{
left = Resolve(methodCallLeftExpression);
}
}
if (binaryExpression.Right is MethodCallExpression methodCallRightExpression)
{
if (!methodCallRightExpression.IsNamedComparison())
{
right = Resolve(methodCallRightExpression);
}
}
if (binaryExpression.Left is UnaryExpression unaryExpression1 &&
(binaryExpression.Right is MemberExpression ))
left = Resolve(unaryExpression1);
if (binaryExpression.Right is UnaryExpression unaryExpression2 &&
(binaryExpression.Left is MemberExpression))
right = Resolve(unaryExpression2);
//组合
if (binaryExpression.NodeType == ExpressionType.AndAlso)
{
return left.And(right);
}
else if (binaryExpression.NodeType == ExpressionType.OrElse)
{
return left.Or(right);
}
else
{
return RoutePredicateExpression.Default;
}
}
}
}
// /// <summary>
// /// 分片条件结果
// /// </summary>
// internal class ShardingPredicateResult
// {
// public ShardingPredicateResult(bool isShardingKey, string shardingPropertyName)
// {
// IsShardingKey = isShardingKey;
// ShardingPropertyName = shardingPropertyName;
// }
// /// <summary>
// /// 是否是分片字段
// /// </summary>
// public bool IsShardingKey { get; }
// /// <summary>
// /// 分片字段名称
// /// </summary>
// public string ShardingPropertyName { get; }
// }
}

9
src/ShardingCore/Utils/ShardingUtil.cs
View File

@ -44,6 +44,15 @@ namespace ShardingCore.Utils
return visitor.GetRouteParseExpression();
}
public static RoutePredicateExpression GetRouteParseExpressionV2(IQueryable queryable, EntityMetadata entityMetadata, Func<object, ShardingOperatorEnum,string, Func<string, bool>> keyToTailExpression,bool shardingTableRoute)
{
QueryableRouteShardingTableDiscoverVisitorV2 visitor = new QueryableRouteShardingTableDiscoverVisitorV2(entityMetadata, keyToTailExpression, shardingTableRoute);
visitor.Visit(queryable.Expression);
return visitor.GetRouteParseExpression();
}
}
}

2
test/ShardingCore.CommonTest/ShardingDataSourceMod.cs
View File

@ -44,7 +44,7 @@ namespace ShardingCore.CommonTest
private void TestId(IQueryable<TestEntity> queryable, string[] dataSourceNames)
{
var routePredicateExpression = ShardingUtil.GetRouteParseExpression(queryable,_testEntityMetadata,GetRouteFilter,false);
var routePredicateExpression = ShardingUtil.GetRouteParseExpressionV2(queryable,_testEntityMetadata,GetRouteFilter,false);
Assert.NotNull(routePredicateExpression);
var routePredicate = routePredicateExpression.GetRoutePredicate();

35
test/ShardingCore.CommonTest/ShardingTableTime.cs
View File

@ -59,7 +59,7 @@ namespace ShardingCore.CommonTest
private void TestId(IQueryable<TestTimeEntity> queryable, string[] tables)
{
var routePredicateExpression = ShardingUtil.GetRouteParseExpression(queryable,_testEntityMetadata,GetRouteFilter,true);
var routePredicateExpression = ShardingUtil.GetRouteParseExpressionV2(queryable,_testEntityMetadata,GetRouteFilter,true);
Assert.NotNull(routePredicateExpression);
var routePredicate = routePredicateExpression.GetRoutePredicate();
@ -95,22 +95,23 @@ namespace ShardingCore.CommonTest
var queryables=new List<IQueryable<TestTimeEntity>>()
{
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==times[0]),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==queryTime),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<queryTime2),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<queryTime3),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<=queryTime3),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==queryTime1),
// new List<TestTimeEntity>().AsQueryable().Where(o=>queryTime==o.Time),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time.Equals(queryTime)),
// new List<TestTimeEntity>().AsQueryable().Where(o=>queryTime.Equals(o.Time)),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==obj1.time),
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time.Equals(obj1.time)),
// new List<TestTimeEntity>().AsQueryable().Where(o=>obj1.time.Equals(o.Time)),
// new List<TestTimeEntity>().AsQueryable().Where(o=>times.Contains(o.Time)),
// new List<TestTimeEntity>().AsQueryable().Where(o=>new []{queryTime}.Contains(o.Time)),
// new List<TestTimeEntity>().AsQueryable().Where(o=>times1.Contains(o.Time)),
// new List<TestTimeEntity>().AsQueryable().Where(o=> new List<DateTime>(){queryTime}.Contains(o.Time))
// new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==times[0]),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<queryTime2),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==queryTime),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<queryTime2),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<queryTime3),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time>=queryTime&&o.Time<=queryTime3),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==queryTime1),
new List<TestTimeEntity>().AsQueryable().Where(o=>queryTime==o.Time),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time.Equals(queryTime)),
new List<TestTimeEntity>().AsQueryable().Where(o=>queryTime.Equals(o.Time)),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time==obj1.time),
new List<TestTimeEntity>().AsQueryable().Where(o=>o.Time.Equals(obj1.time)),
new List<TestTimeEntity>().AsQueryable().Where(o=>obj1.time.Equals(o.Time)),
new List<TestTimeEntity>().AsQueryable().Where(o=>times.Contains(o.Time)),
new List<TestTimeEntity>().AsQueryable().Where(o=>new []{queryTime}.Contains(o.Time)),
new List<TestTimeEntity>().AsQueryable().Where(o=>times1.Contains(o.Time)),
new List<TestTimeEntity>().AsQueryable().Where(o=> new List<DateTime>(){queryTime}.Contains(o.Time))
};
TestFor(queryables,tables);
}