Skip to content

Optimize MakeGenericMethod() invocations compile-time known generic types #367

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

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Optimize MakeGenericMethod() invocations compile-time known generic types #367

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
23 changes: 14 additions & 9 deletions Orm/Xtensive.Orm/Orm/QueryableExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
// Created by: Alexey Gamzov
// Created: 2009.05.06

using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
using System.Reflection;
using JetBrains.Annotations;
using Xtensive.Core;
using Xtensive.Orm.Internals;
Expand All @@ -23,6 +19,17 @@ namespace Xtensive.Orm
/// </summary>
public static partial class QueryableExtensions
{
private static class Traits<T>
{
public static readonly MethodInfo ExtensionTagMethodInfo = WellKnownMembers.Queryable.ExtensionTag.MakeGenericMethod([typeof(T)]);
}

private static class Traits<TOuter, TInner, TKey, TResult>
{
public static readonly MethodInfo ExtensionLeftJoinMethodInfo
= WellKnownMembers.Queryable.ExtensionLeftJoin.MakeGenericMethod([typeof (TOuter), typeof(TInner), typeof(TKey), typeof(TResult)]);
}

/// <summary>
/// Tags query with given <paramref name="tag"/> string
/// (inserts string as comment in SQL statement) for
Expand All @@ -43,8 +50,7 @@ public static IQueryable<TSource> Tag<TSource>(this IQueryable<TSource> source,
throw new NotSupportedException(string.Format(errorMessage, providerType));
}

var genericMethod = WellKnownMembers.Queryable.ExtensionTag.MakeGenericMethod(new[] { typeof(TSource) });
var expression = Expression.Call(null, genericMethod, new[] { source.Expression, Expression.Constant(tag)});
var expression = Expression.Call(null, Traits<TSource>.ExtensionTagMethodInfo, new[] { source.Expression, Expression.Constant(tag)});
return source.Provider.CreateQuery<TSource>(expression);
}

Expand Down Expand Up @@ -340,8 +346,7 @@ public static IQueryable<TResult> LeftOuterJoin<TOuter, TInner, TKey, TResult>(t
throw new NotSupportedException(string.Format(errorMessage, outerProviderType));
}

var genericMethod = WellKnownMembers.Queryable.ExtensionLeftJoin.MakeGenericMethod(new[] {typeof (TOuter), typeof(TInner), typeof(TKey), typeof(TResult)});
var expression = Expression.Call(null, genericMethod, new[] {outer.Expression, GetSourceExpression(inner), outerKeySelector, innerKeySelector, resultSelector});
var expression = Expression.Call(null, Traits<TOuter, TInner, TKey, TResult>.ExtensionLeftJoinMethodInfo, new[] {outer.Expression, GetSourceExpression(inner), outerKeySelector, innerKeySelector, resultSelector});
return outer.Provider.CreateQuery<TResult>(expression);
}

Expand Down