Skip to content
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

Refactor sequential select #1979

Merged
merged 6 commits into from
Jan 31, 2019
Merged

Refactor sequential select #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f8c972
Refactor sequential select
maca88 Jan 15, 2019
6484c2b
Minor corrections
maca88 Jan 16, 2019
9d64cde
Avoid breaking change for HasSequentialSelect and deprecate it
maca88 Jan 16, 2019
07e02c4
Obsolete AbstractEntityPersister.Hydrate method with the rootLoadable…
maca88 Jan 22, 2019
692a987
Merge branch 'master' into RefactorSequentialSelect
fredericDelaporte Jan 29, 2019
af03419
Merge remote-tracking branch 'origin/master' into RefactorSequentialS…
maca88 Jan 30, 2019
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
2 changes: 1 addition & 1 deletion src/NHibernate/Async/Loader/Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ private async Task LoadFromResultSetAsync(DbDataReader rs, int i, object obj, st
? EntityAliases[i].SuffixedPropertyAliases
: GetSubclassEntityAliases(i, persister);

object[] values = await (persister.HydrateAsync(rs, id, obj, rootPersister, cols, eagerFetchProperties, eagerPropertyFetch, session, cancellationToken)).ConfigureAwait(false);
object[] values = await (persister.HydrateAsync(rs, id, obj, cols, eagerFetchProperties, eagerPropertyFetch, session, cancellationToken)).ConfigureAwait(false);

object rowId = persister.HasRowId ? rs[EntityAliases[i].RowIdAlias] : null;

Expand Down
85 changes: 37 additions & 48 deletions src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
using Property=NHibernate.Mapping.Property;
using NHibernate.SqlTypes;
using System.Linq;
using System.Linq.Expressions;
using NHibernate.Bytecode;

namespace NHibernate.Persister.Entity
Expand Down Expand Up @@ -101,7 +102,7 @@ async Task InternalInitializeLazyPropertiesAsync()
}
}

var values = await (HydrateAsync(rs, id, entity, rootPersister, suffixedPropertyColumns, null, true, indexes, session, cancellationToken)).ConfigureAwait(false);
var values = await (HydrateAsync(rs, id, entity, suffixedPropertyColumns, null, true, indexes, session, cancellationToken)).ConfigureAwait(false);
for (var i = 0; i < lazyIndexes.Length; i++)
{
var value = values[i];
Expand Down Expand Up @@ -400,14 +401,14 @@ protected async Task<int> DehydrateAsync(object id, object[] fields, object rowI
/// Unmarshall the fields of a persistent instance from a result set,
/// without resolving associations or collections
/// </summary>
public Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj, ILoadable rootLoadable,
public Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj,
string[][] suffixedPropertyColumns, ISet<string> fetchedLazyProperties, bool allProperties, ISessionImplementor session, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled<object[]>(cancellationToken);
}
return HydrateAsync(rs, id, obj, rootLoadable, suffixedPropertyColumns, fetchedLazyProperties, allProperties, null, session, cancellationToken);
return HydrateAsync(rs, id, obj, suffixedPropertyColumns, fetchedLazyProperties, allProperties, null, session, cancellationToken);
}

/// <summary>
Expand All @@ -423,14 +424,14 @@ public Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj, ILoad
{
return Task.FromCanceled<object[]>(cancellationToken);
}
return HydrateAsync(rs, id, obj, rootLoadable, suffixedPropertyColumns, null, allProperties, null, session, cancellationToken);
return HydrateAsync(rs, id, obj, suffixedPropertyColumns, null, allProperties, null, session, cancellationToken);
}

/// <summary>
/// Unmarshall the fields of a persistent instance from a result set,
/// without resolving associations or collections
/// </summary>
private async Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj, ILoadable rootLoadable, string[][] suffixedPropertyColumns,
private async Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj, string[][] suffixedPropertyColumns,
ISet<string> fetchedLazyProperties, bool allProperties, int[] indexes, ISessionImplementor session, CancellationToken cancellationToken)
{
cancellationToken.ThrowIfCancellationRequested();
Expand All @@ -439,49 +440,43 @@ private async Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj
log.Debug("Hydrating entity: {0}", MessageHelper.InfoString(this, id, Factory));
}

AbstractEntityPersister rootPersister = (AbstractEntityPersister)rootLoadable;

bool hasDeferred = rootPersister.HasSequentialSelect;
var sequentialSql = GetSequentialSelect();
DbCommand sequentialSelect = null;
DbDataReader sequentialResultSet = null;
bool sequentialSelectEmpty = false;
using (session.BeginProcess())
try
{
if (hasDeferred)
if (sequentialSql != null)
{
SqlString sql = rootPersister.GetSequentialSelect(EntityName);
if (sql != null)
//TODO: I am not so sure about the exception handling in this bit!
sequentialSelect = await (session.Batcher.PrepareCommandAsync(CommandType.Text, sequentialSql, IdentifierType.SqlTypes(factory), cancellationToken)).ConfigureAwait(false);
await (IdentifierType.NullSafeSetAsync(sequentialSelect, id, 0, session, cancellationToken)).ConfigureAwait(false);
sequentialResultSet = await (session.Batcher.ExecuteReaderAsync(sequentialSelect, cancellationToken)).ConfigureAwait(false);
if (!await (sequentialResultSet.ReadAsync(cancellationToken)).ConfigureAwait(false))
{
//TODO: I am not so sure about the exception handling in this bit!
sequentialSelect = await (session.Batcher.PrepareCommandAsync(CommandType.Text, sql, IdentifierType.SqlTypes(factory), cancellationToken)).ConfigureAwait(false);
await (rootPersister.IdentifierType.NullSafeSetAsync(sequentialSelect, id, 0, session, cancellationToken)).ConfigureAwait(false);
sequentialResultSet = await (session.Batcher.ExecuteReaderAsync(sequentialSelect, cancellationToken)).ConfigureAwait(false);
if (!await (sequentialResultSet.ReadAsync(cancellationToken)).ConfigureAwait(false))
{
// TODO: Deal with the "optional" attribute in the <join> mapping;
// this code assumes that optional defaults to "true" because it
// doesn't actually seem to work in the fetch="join" code
//
// Note that actual proper handling of optional-ality here is actually
// more involved than this patch assumes. Remember that we might have
// multiple <join/> mappings associated with a single entity. Really
// a couple of things need to happen to properly handle optional here:
// 1) First and foremost, when handling multiple <join/>s, we really
// should be using the entity root table as the driving table;
// another option here would be to choose some non-optional joined
// table to use as the driving table. In all likelihood, just using
// the root table is much simplier
// 2) Need to add the FK columns corresponding to each joined table
// to the generated select list; these would then be used when
// iterating the result set to determine whether all non-optional
// data is present
// My initial thoughts on the best way to deal with this would be
// to introduce a new SequentialSelect abstraction that actually gets
// generated in the persisters (ok, SingleTable...) and utilized here.
// It would encapsulated all this required optional-ality checking...
sequentialSelectEmpty = true;
}
// TODO: Deal with the "optional" attribute in the <join> mapping;
// this code assumes that optional defaults to "true" because it
// doesn't actually seem to work in the fetch="join" code
//
// Note that actual proper handling of optional-ality here is actually
// more involved than this patch assumes. Remember that we might have
// multiple <join/> mappings associated with a single entity. Really
// a couple of things need to happen to properly handle optional here:
// 1) First and foremost, when handling multiple <join/>s, we really
// should be using the entity root table as the driving table;
// another option here would be to choose some non-optional joined
// table to use as the driving table. In all likelihood, just using
// the root table is much simplier
// 2) Need to add the FK columns corresponding to each joined table
// to the generated select list; these would then be used when
// iterating the result set to determine whether all non-optional
// data is present
// My initial thoughts on the best way to deal with this would be
// to introduce a new SequentialSelect abstraction that actually gets
// generated in the persisters (ok, SingleTable...) and utilized here.
// It would encapsulated all this required optional-ality checking...
sequentialSelectEmpty = true;
}
}

Expand All @@ -491,7 +486,6 @@ private async Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj
IType[] types = PropertyTypes;
object[] values = new object[length];
bool[] laziness = PropertyLaziness;
string[] propSubclassNames = SubclassPropertySubclassNameClosure;

for (int j = 0; j < length; j++)
{
Expand All @@ -503,8 +497,7 @@ private async Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj
else if (allProperties || !laziness[i] || fetchedLazyProperties?.Contains(propNames[i]) == true)
{
//decide which ResultSet to get the property value from:
bool propertyIsDeferred = hasDeferred
&& rootPersister.IsSubclassPropertyDeferred(propNames[i], propSubclassNames[i]);
var propertyIsDeferred = sequentialSql != null && IsPropertyDeferred(i);
if (propertyIsDeferred && sequentialSelectEmpty)
{
values[j] = null;
Expand All @@ -522,15 +515,11 @@ private async Task<object[]> HydrateAsync(DbDataReader rs, object id, object obj
}
}

if (sequentialResultSet != null)
{
sequentialResultSet.Close();
}

return values;
}
finally
{
sequentialResultSet?.Close();
if (sequentialSelect != null)
{
session.Batcher.CloseCommand(sequentialSelect, sequentialResultSet);
Expand Down
8 changes: 6 additions & 2 deletions src/NHibernate/Async/Persister/Entity/ILoadable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static partial class LoadableExtensions
/// </summary>
//6.0 TODO: Merge into ILoadable
public static Task<object[]> HydrateAsync(
this ILoadable loadable, DbDataReader rs, object id, object obj, ILoadable rootLoadable,
this ILoadable loadable, DbDataReader rs, object id, object obj,
string[][] suffixedPropertyColumns, ISet<string> fetchedLazyProperties, bool allProperties, ISessionImplementor session, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
Expand All @@ -50,8 +50,12 @@ public static Task<object[]> HydrateAsync(
if (loadable is AbstractEntityPersister abstractEntityPersister)
{
return abstractEntityPersister.HydrateAsync(
rs, id, obj, rootLoadable, suffixedPropertyColumns, fetchedLazyProperties, allProperties, session, cancellationToken);
rs, id, obj, suffixedPropertyColumns, fetchedLazyProperties, allProperties, session, cancellationToken);
}

var rootLoadable = loadable.RootEntityName == loadable.EntityName
? loadable
: (ILoadable) loadable.Factory.GetEntityPersister(loadable.RootEntityName);

#pragma warning disable 618
// Fallback to the old behavior
Expand Down
2 changes: 1 addition & 1 deletion src/NHibernate/Loader/Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ private void LoadFromResultSet(DbDataReader rs, int i, object obj, string instan
? EntityAliases[i].SuffixedPropertyAliases
: GetSubclassEntityAliases(i, persister);

object[] values = persister.Hydrate(rs, id, obj, rootPersister, cols, eagerFetchProperties, eagerPropertyFetch, session);
object[] values = persister.Hydrate(rs, id, obj, cols, eagerFetchProperties, eagerPropertyFetch, session);

object rowId = persister.HasRowId ? rs[EntityAliases[i].RowIdAlias] : null;

Expand Down
Loading