Skip to content

Commit b813818

Browse files
committed
clean up
1 parent 8b1ae17 commit b813818

7 files changed

+13
-7
lines changed

src/NHibernate/Loader/BatchFetchStyle.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
namespace NHibernate.Loader
22
{
3+
/// <summary>
4+
/// Defines the style that should be used to perform batch loading.
5+
/// </summary>
36
public enum BatchFetchStyle
47
{
58
/// <summary>

src/NHibernate/Loader/Collection/DynamicBatchingCollectionLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private JoinWalker BuildJoinWalker(IQueryableCollection collectionPersister, ISe
3030
private protected override SqlString TransformSql(SqlString sqlString, QueryParameters queryParameters, HashSet<IParameterSpecification> parameterSpecifications)
3131
{
3232
var columns = StringHelper.Qualify(_alias, CollectionPersister.KeyColumnNames);
33-
DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var parameters, out var result);
33+
DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var result, out var parameters);
3434
parameterSpecifications.UnionWith(CreateParameterSpecificationsAndAssignBackTrack(parameters));
3535
return result;
3636
}

src/NHibernate/Loader/DynamicBatchingHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static SqlStringBuilder BuildBatchFetchRestrictionFragment()
1414
return new SqlStringBuilder(1).Add(BatchIdPlaceholder);
1515
}
1616

17-
public static void ExpandBatchIdPlaceholder(SqlString sqlString, QueryParameters queryParameters, string[] columns, Dialect.Dialect dialect, out Parameter[] parameters, out SqlString result)
17+
public static void ExpandBatchIdPlaceholder(SqlString sqlString, QueryParameters queryParameters, string[] columns, Dialect.Dialect dialect, out SqlString result, out Parameter[] parameters)
1818
{
1919
var wherePart = GenerateWherePart(queryParameters, columns, dialect, out parameters);
2020
result = sqlString.ReplaceLast(BatchIdPlaceholder, wherePart);

src/NHibernate/Loader/Entity/AbstractEntityLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ internal protected List<IParameterSpecification> CreateParameterSpecificationsAn
9292
return specifications;
9393
}
9494

95-
protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()
95+
protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()
9696
{
9797
return parametersSpecifications ?? (parametersSpecifications = CreateParameterSpecificationsAndAssignBackTrack(SqlString.GetParameters()).ToArray());
9898
}

src/NHibernate/Loader/Entity/DynamicBatchingEntityLoaderBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
namespace NHibernate.Loader.Entity
66
{
77
/// <summary>
8-
/// A BatchingEntityLoaderBuilder that builds IUniqueEntityLoader instances capable of dynamically building
8+
/// Builds <see cref="IUniqueEntityLoader"/> instances capable of dynamically building
99
/// its batch-fetch SQL based on the actual number of entity ids waiting to be fetched.
1010
/// </summary>
11-
public partial class DynamicBatchingEntityLoaderBuilder : BatchingEntityLoaderBuilder
11+
public class DynamicBatchingEntityLoaderBuilder : BatchingEntityLoaderBuilder
1212
{
1313
protected override IUniqueEntityLoader BuildBatchingLoader(IOuterJoinLoadable persister, int batchSize, LockMode lockMode, ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters)
1414
{

src/NHibernate/Loader/Entity/DynamicEntityLoader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public virtual IList DoEntityBatchFetch(ISessionImplementor session, QueryParame
3131
private protected override SqlString TransformSql(SqlString sqlString, QueryParameters queryParameters, HashSet<IParameterSpecification> parameterSpecifications)
3232
{
3333
var columns = StringHelper.Qualify(_alias, persister.KeyColumnNames);
34-
DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var parameters, out var result);
34+
DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var result, out var parameters);
3535
parameterSpecifications.UnionWith(CreateParameterSpecificationsAndAssignBackTrack(parameters));
3636
return result;
3737
}
3838

3939
class DynamicEntityJoinWalker : EntityJoinWalker
4040
{
41-
public DynamicEntityJoinWalker(IOuterJoinLoadable persister, string[] identifierColumnNames, LockMode lockMode, ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters) : base(persister, identifierColumnNames, -1, lockMode, factory, enabledFilters)
41+
public DynamicEntityJoinWalker(IOuterJoinLoadable persister, string[] identifierColumnNames, LockMode lockMode, ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters) : base(persister, identifierColumnNames, 1, lockMode, factory, enabledFilters)
4242
{
4343
}
4444

src/NHibernate/Loader/Entity/LegacyBatchingEntityLoaderBuilder.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
namespace NHibernate.Loader.Entity
66
{
7+
/// <summary>
8+
/// Default batching builder. See <see cref="BatchFetchStyle.Legacy"/>
9+
/// </summary>
710
public class LegacyBatchingEntityLoaderBuilder : BatchingEntityLoaderBuilder
811
{
912
protected override IUniqueEntityLoader BuildBatchingLoader(IOuterJoinLoadable persister, int batchSize, LockMode lockMode, ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters)

0 commit comments

Comments
 (0)