Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1849,11 +1849,10 @@ private static IReadOnlySet<int> GetNullableGroupingExpressions(IReadOnlyList<(C
return nullableFields;
}

private bool IsKeyCollection(Type localCollectionType)
{
return (localCollectionType.IsArray && localCollectionType.GetElementType() == WellKnownOrmTypes.Key)
|| IEnumerableOfKeyType.IsAssignableFrom(localCollectionType);
}
private bool IsKeyCollection(Type localCollectionType) =>
(localCollectionType.IsArray && localCollectionType.GetElementType() == WellKnownOrmTypes.Key)
|| IEnumerableOfKeyType.IsAssignableFrom(localCollectionType)
|| localCollectionType.IsOfGenericType(WellKnownTypes.ReadOnlySpanOfT) && localCollectionType.GetGenericArguments()[0] == WellKnownOrmTypes.Key;

internal void RestoreState(in TranslatorState previousState) =>
State = previousState;
Expand Down
6 changes: 6 additions & 0 deletions Orm/Xtensive.Orm/Orm/Linq/WellKnownMembers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,12 @@ public static class Enumerable
public static readonly MethodInfo Cast = GetMethod(typeof(System.Linq.Enumerable), nameof(System.Linq.Enumerable.Cast), 1, 1);
}

public static class MemoryExtensions
{
public static readonly MethodInfo ContainsInReadOnlySpan = typeof(System.MemoryExtensions).GetMethods()
.Where(m => m.Name == "Contains" && m.GetParameterTypes()[0].GetGenericTypeDefinition() == WellKnownTypes.ReadOnlySpanOfT).First();
}

// IEntity
public static readonly PropertyInfo IEntityKey = WellKnownOrmInterfaces.Entity.GetProperty(WellKnown.KeyFieldName);
public static readonly PropertyInfo TypeId = WellKnownOrmInterfaces.Entity.GetProperty(WellKnown.TypeIdFieldName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ private SqlExpression Visit(Expression e, bool smartNull)
if (evaluator.CanBeEvaluated(e)) {
if (parameterExtractor.IsParameter(e))
return VisitParameterAccess(e, smartNull);
if (e.NodeType == ExpressionType.Call) {
var mc = (MethodCallExpression) e;
var methodDeclaringType = mc.Method.DeclaringType;
if (methodDeclaringType.IsGenericType && methodDeclaringType.GetGenericTypeDefinition() == WellKnownTypes.ReadOnlySpanOfT) {
e = mc.Arguments[0];
}
}
return VisitConstant(ExpressionEvaluator.Evaluate(e));
}
return base.Visit(e);
Expand Down Expand Up @@ -410,8 +417,12 @@ protected override SqlExpression VisitMethodCall(MethodCallExpression mc)
var arguments = mc.Arguments.SelectToArray(a => Visit(a));
var mi = mc.Method;

if (mc.Object!=null && mc.Object.Type!=mi.ReflectedType)
if (mc.Object!=null && mc.Object.Type!=mi.ReflectedType) {
mi = mc.Object.Type.GetMethod(mi.Name, mi.GetParameterTypes());
}
else if (mi.IsGenericMethod && mi.GetGenericMethodDefinition() == WellKnownMembers.MemoryExtensions.ContainsInReadOnlySpan) {
mi = WellKnownMembers.Enumerable.Contains.CachedMakeGenericMethod(mi.GetGenericArguments()[0]);
}

return CompileMember(mi, Visit(mc.Object), arguments);
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
"version": "9.0.102",
"version": "9.0.200",
"rollForward": "latestMajor"
}
}