Skip to content

Reuse joins generated by Where and OrderBy methods when fetching for Linq provider #2496

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 5 commits into from
Sep 8, 2020
Merged

Reuse joins generated by Where and OrderBy methods when fetching for Linq provider #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
408ea24
Reuse joins generated by Where and OrderBy methods when fetching for …
maca88 Aug 23, 2020
bcadc9e
Fix CodeFactor issue
maca88 Aug 23, 2020
3183588
Code review changes
maca88 Aug 25, 2020
8bf27ab
Code review changes
maca88 Aug 26, 2020
8c35edc
Remove unnecessary out parameter
hazzik Aug 28, 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
226 changes: 226 additions & 0 deletions src/NHibernate.Test/Async/Linq/EagerLoadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,5 +381,231 @@ public async Task WhereAfterFetchAndSingleOrDefaultAsync()

Assert.IsTrue(NHibernateUtil.IsInitialized(order.Shipper));
}

[Test]
public async Task WhereReuseJoinsAsync()
{
OrderLine orderLine;
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.Customer.ContactName == "Maria Anders")
.Fetch(o => o.Order).ThenFetch(o => o.Customer)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.True);
}

session.Clear();
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.Customer.ContactName == "Maria Anders")
.Fetch(o => o.Order)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.False);
}

session.Clear();
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.OrderLines.Any(l => l.Product.Name == "Tofu"))
.Fetch(o => o.Order).ThenFetch(o => o.Customer)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
sql = sql.Substring(0, sql.IndexOf("where"));
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.True);
}

using (var logSpy = new SqlLogSpy())
{
(await (db.Employees
.Where(o => o.Superior.Superior.Superior.FirstName != null)
.Fetch(o => o.Superior)
.ToListAsync()))
.FirstOrDefault();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, ","), Is.EqualTo(31), "Only the first level should be fetched.");
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(3));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(3));
}

using (var logSpy = new SqlLogSpy())
{
(await (db.Employees
.Where(o => o.Superior.FirstName != null)
.Fetch(o => o.Superior).ThenFetch(o => o.Superior).ThenFetch(o => o.Superior)
.ToListAsync()))
.FirstOrDefault();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(3));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(1));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(2));
}
}

[Test]
public async Task OrderByReuseJoinsAsync()
{
OrderLine orderLine;
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.OrderId == 10248)
.OrderBy(o => o.Order.Customer.ContactName)
.Fetch(o => o.Order).ThenFetch(o => o.Customer)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.True);
}

session.Clear();
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.OrderId == 10248)
.OrderBy(o => o.Order.Customer.ContactName)
.Fetch(o => o.Order)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.False);
}

using (var logSpy = new SqlLogSpy())
{
(await (db.Employees
.OrderBy(o => o.Superior.Superior.Superior.FirstName)
.Fetch(o => o.Superior)
.ToListAsync()))
.FirstOrDefault();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, ","), Is.EqualTo(31), "Only the first level should be fetched.");
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(3));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(3));
}

using (var logSpy = new SqlLogSpy())
{
(await (db.Employees
.OrderBy(o => o.Superior.FirstName)
.Fetch(o => o.Superior).ThenFetch(o => o.Superior).ThenFetch(o => o.Superior)
.ToListAsync()))
.FirstOrDefault();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(3));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(3));
}
}

[Test]
public async Task WhereAndOrderByReuseJoinsAsync()
{
OrderLine orderLine;
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.Customer.ContactName == "Maria Anders")
.OrderBy(o => o.Order.Customer.ContactName)
.Fetch(o => o.Order).ThenFetch(o => o.Customer)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.True);
}

session.Clear();
using (var logSpy = new SqlLogSpy())
{
orderLine = (await (db.OrderLines
.Where(o => o.Order.Customer.ContactName == "Maria Anders")
.OrderBy(o => o.Order.Customer.ContactName)
.Fetch(o => o.Order)
.ToListAsync()))
.First();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(2));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(2));
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order), Is.True);
Assert.That(NHibernateUtil.IsInitialized(orderLine.Order.Customer), Is.False);
}

using (var logSpy = new SqlLogSpy())
{
(await (db.Employees
.Where(o => o.Superior.Superior.Superior.FirstName != null)
.OrderBy(o => o.Superior.Superior.Superior.FirstName)
.Fetch(o => o.Superior)
.ToListAsync()))
.FirstOrDefault();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, ","), Is.EqualTo(31), "Only the first level should be fetched.");
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(3));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(3));
}

using (var logSpy = new SqlLogSpy())
{
(await (db.Employees
.Where(o => o.Superior.FirstName != null)
.OrderBy(o => o.Superior.FirstName)
.Fetch(o => o.Superior).ThenFetch(o => o.Superior).ThenFetch(o => o.Superior)
.ToListAsync()))
.FirstOrDefault();

var sql = logSpy.GetWholeLog();
Assert.That(GetTotalOccurrences(sql, "join"), Is.EqualTo(3));
Assert.That(GetTotalOccurrences(sql, "inner join"), Is.EqualTo(1));
Assert.That(GetTotalOccurrences(sql, "left outer join"), Is.EqualTo(2));
}
}

[Test]
public async Task FetchBeforeSelectAsync()
{
var result = await (db.Orders
.Where(o => o.OrderId == 10248)
.Fetch(x => x.Customer)
.Select(x => new {x.Customer.ContactName})
.ToListAsync());

Assert.True(result.Any());
}
}
}
Loading