Skip to content

revert: remove MemoryExtensions.Contains handling from QueryConverter #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
korchak-aleksandr wants to merge 1 commit into from
Closed

revert: remove MemoryExtensions.Contains handling from QueryConverter #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 0 additions & 112 deletions Mindbox.Data.Linq.Tests/SqlGeneration/ArrayContainsTranslationTests.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Mindbox.Data.Linq/Mindbox.Data.Linq.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageVersion>10.8.1$(VersionTag)</PackageVersion>
<PackageVersion>10.8.2$(VersionTag)</PackageVersion>
<NoWarn>SYSLIB0003;SYSLIB0011</NoWarn>
</PropertyGroup>

Expand Down
63 changes: 0 additions & 63 deletions Mindbox.Data.Linq/SqlClient/Query/QueryConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,54 +1774,6 @@ private SqlExpression GetAggregate(SqlNodeType aggType, Type clrType, SqlExpress
return new SqlUnary(aggType, clrType, sqlType, exp, this.dominatingExpression);
}

/// <summary>
/// Searches for an array of the given type in a delegate's closure.
/// Handles direct T[] fields (display class) and Object[] fields (runtime Closure),
/// including delegates nested inside Object[] fields (up to depth 3).
/// </summary>
private static object FindArrayInClosure(object target, Type arrayType, int depth = 0) {
if (target == null || depth > 3) {
return null;
}
foreach (var f in target.GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)) {
var val = f.GetValue(target);
if (val?.GetType() == arrayType) {
return val;
}
if (val is object[] items) {
foreach (var item in items) {
if (item?.GetType() == arrayType) {
return item;
}
if (item is Delegate nested && nested.Target != null) {
var found = FindArrayInClosure(nested.Target, arrayType, depth + 1);
if (found != null) {
return found;
}
}
}
}
}
return null;
}

private static Expression TryExtractArrayFromSpanExpression(Expression spanExpr) {
if (spanExpr is MethodCallExpression { Arguments: [var arrayExpr] }) {
return arrayExpr;
}

if (spanExpr is InvocationExpression { Arguments.Count: 0, Expression: ConstantExpression { Value: Delegate { Target: { } target } } }
&& spanExpr.Type.GetGenericArguments() is [var elementType]) {
var arrayType = elementType.MakeArrayType();
var array = FindArrayInClosure(target, arrayType);
if (array != null) {
return Expression.Constant(array, arrayType);
}
}

return null;
}

private SqlNode VisitContains(Expression sequence, Expression value) {
Type elemType = TypeSystem.GetElementType(sequence.Type);
SqlNode seqNode = this.Visit(sequence);
Expand Down Expand Up @@ -1927,21 +1879,6 @@ private SqlNode VisitMethodCall(MethodCallExpression mc) {
if (this.IsSequenceOperatorCall(mc)) {
return this.VisitSequenceOperatorCall(mc);
}
// In .NET 10, array.Contains(value) in expression trees compiles to
// MemoryExtensions.Contains(ReadOnlySpan<T> span, value).
// Two compiler patterns exist for the span argument:
// 1. MethodCallExpression(op_Implicit, [array]) — simple local capture
// 2. InvocationExpression(ConstantExpression(pre_compiled_delegate), []) — nested closure
// Both must be unwrapped to extract the underlying array for SQL IN translation.
else if (mc.Method.DeclaringType == typeof(MemoryExtensions)
&& mc.Method.Name == "Contains"
&& mc.Arguments[0].Type is { IsGenericType: true } spanType
&& spanType.GetGenericTypeDefinition() == typeof(ReadOnlySpan<>)) {
var arrayExpr = TryExtractArrayFromSpanExpression(mc.Arguments[0]);
if (arrayExpr != null) {
return this.VisitContains(arrayExpr, mc.Arguments[1]);
}
}
else if (IsDataManipulationCall(mc)) {
return this.VisitDataManipulationCall(mc);
}
Expand Down
Loading