Skip to content

Fix OData filtering by a base class member #2387

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 2 commits into from
May 19, 2020
Merged

Fix OData filtering by a base class member #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaea67d
Fix OData filtering by a base class member
maca88 May 17, 2020
19a4d40
Move comment
maca88 May 17, 2020
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
24 changes: 24 additions & 0 deletions src/NHibernate.Test/Async/Linq/ODataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,28 @@ public async Task OrderGroupByAsync(string queryString, int expectedRows)
Assert.That(results, Has.Count.EqualTo(expectedRows));
}

private class CustomerVm : BaseCustomerVm
{
}

private class BaseCustomerVm
{
public string Id { get; set; }

public string Name { get; set; }
}

[TestCase("$filter=Name eq 'Maria Anders'", 1)]
public async Task BasePropertyFilterAsync(string queryString, int expectedRows)
{
var query = ApplyFilter(
session.Query<Customer>().Select(o => new CustomerVm {Name = o.ContactName, Id = o.CustomerId}),
queryString);

var results = await (((IQueryable<CustomerVm>) query).ToListAsync());
Assert.That(results, Has.Count.EqualTo(expectedRows));
}

private IQueryable ApplyFilter<T>(IQueryable<T> query, string queryString)
{
var context = new ODataQueryContext(CreatEdmModel(), typeof(T), null) { };
Expand Down Expand Up @@ -143,6 +165,8 @@ private static IEdmModel CreatEdmModel()
employeeModel.EntityType.Property(o => o.Title);
employeeModel.EntityType.HasMany(o => o.Orders);

builder.EntitySet<CustomerVm>(nameof(CustomerVm));

return builder.GetEdmModel();
}

Expand Down
24 changes: 24 additions & 0 deletions src/NHibernate.Test/Linq/ODataTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,28 @@ public void OrderGroupBy(string queryString, int expectedRows)
Assert.That(results, Has.Count.EqualTo(expectedRows));
}

private class CustomerVm : BaseCustomerVm
{
}

private class BaseCustomerVm
{
public string Id { get; set; }

public string Name { get; set; }
}

[TestCase("$filter=Name eq 'Maria Anders'", 1)]
public void BasePropertyFilter(string queryString, int expectedRows)
{
var query = ApplyFilter(
session.Query<Customer>().Select(o => new CustomerVm {Name = o.ContactName, Id = o.CustomerId}),
queryString);

var results = ((IQueryable<CustomerVm>) query).ToList();
Assert.That(results, Has.Count.EqualTo(expectedRows));
}

private IQueryable ApplyFilter<T>(IQueryable<T> query, string queryString)
{
var context = new ODataQueryContext(CreatEdmModel(), typeof(T), null) { };
Expand Down Expand Up @@ -131,6 +153,8 @@ private static IEdmModel CreatEdmModel()
employeeModel.EntityType.Property(o => o.Title);
employeeModel.EntityType.HasMany(o => o.Orders);

builder.EntitySet<CustomerVm>(nameof(CustomerVm));

return builder.GetEdmModel();
}

Expand Down
1 change: 1 addition & 0 deletions src/NHibernate/Linq/NhLinqExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public IASTNode Translate(ISessionFactoryImplementor sessionFactory, bool filter

var requiredHqlParameters = new List<NamedParameterDescriptor>();
var queryModel = NhRelinqQueryParser.Parse(_expression);
queryModel.TransformExpressions(TransparentIdentifierRemovingExpressionVisitor.ReplaceTransparentIdentifiers);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fortunately that is cached in the query plan cache, so it is acceptable to traverse it again I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, the only thing that we could do is to make the capacity of the query cache configurable as currently is hardcoded to 128

nhibernate-core/src/NHibernate/Engine/Query/QueryPlanCache.cs

Line 29 in 7468a00

private readonly SoftLimitMRUCache planCache = new SoftLimitMRUCache(128);

which may be a little to small for larger applications. Of course, this should be done in a separate PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course, this should be done in a separate PR.

Especially since that could be a deep rabbit hole. I think we should instead get rid of this SoftLimitMRUCache and use something like System.Runtime.MemoryCache.

The limit is hardcoded to 128, but that is not a strong limit. SoftLimitMRUCache uses only weak references past 128 entries and lets the garbage collector decides whether to free them or not.

var visitorParameters = new VisitorParameters(sessionFactory, _constantToParameterMap, requiredHqlParameters,
new QuerySourceNamer(), TargetType, QueryMode);

Expand Down
2 changes: 2 additions & 0 deletions src/NHibernate/Linq/Visitors/TransparentIdentifierRemovingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ namespace NHibernate.Linq.Visitors
// Copied from Relinq and added a fallback for comparing two member info by DeclaringType and Name
// 6.0 TODO: drop if https://github.com/OData/WebApi/issues/2108 is fixed and add a possible breaking
// change requiring to upgrade OData. (See https://github.com/nhibernate/nhibernate-core/pull/2322#discussion_r401215456 )
// Use this version in order to support expressions that were created programmatically and do not mimic what the C# compiler generates.
// Consider removing this if https://re-motion.atlassian.net/projects/RMLNQ/issues/RMLNQ-121 is fixed and we upgrade ReLinq.
/// <summary>
/// Replaces expression patterns of the form <c>new T { x = 1, y = 2 }.x</c> (<see cref="MemberInitExpression"/>) or
/// <c>new T ( x = 1, y = 2 ).x</c> (<see cref="NewExpression"/>) to <c>1</c> (or <c>2</c> if <c>y</c> is accessed instead of <c>x</c>).
Expand Down