Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5948] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2011-06-18 13:14:52
|
Revision: 5948
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5948&view=rev
Author: fabiomaulo
Date: 2011-06-18 13:14:46 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
Removed no more needed code
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs
trunk/nhibernate/src/NHibernate/Loader/Collection/CollectionLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs
trunk/nhibernate/src/NHibernate/Loader/Loader.cs
trunk/nhibernate/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs
trunk/nhibernate/src/NHibernate/Persister/Collection/OneToManyPersister.cs
Modified: trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Engine/SubselectFetch.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
using Iesi.Collections.Generic;
using NHibernate.Persister.Entity;
using NHibernate.SqlCommand;
@@ -10,17 +9,15 @@
{
private readonly string alias;
private readonly ILoadable loadable;
- private readonly IDictionary<string, int[]> namedParameterLocMap;
private readonly QueryParameters queryParameters;
private readonly SqlString queryString;
private readonly ISet<EntityKey> resultingEntityKeys;
public SubselectFetch(string alias, ILoadable loadable, QueryParameters queryParameters,
- ISet<EntityKey> resultingEntityKeys, IDictionary<string, int[]> namedParameterLocMap)
+ ISet<EntityKey> resultingEntityKeys)
{
this.resultingEntityKeys = resultingEntityKeys;
this.queryParameters = queryParameters;
- this.namedParameterLocMap = namedParameterLocMap;
this.loadable = loadable;
this.alias = alias;
@@ -37,11 +34,6 @@
get { return resultingEntityKeys; }
}
- public IDictionary<string, int[]> NamedParameterLocMap
- {
- get { return namedParameterLocMap; }
- }
-
public SqlString ToSubselectString(string ukname)
{
string[] joinColumns = ukname == null
Modified: trunk/nhibernate/src/NHibernate/Loader/Collection/CollectionLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Collection/CollectionLoader.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Loader/Collection/CollectionLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -68,7 +68,7 @@
return parametersSpecifications ?? (parametersSpecifications = CreateParameterSpecificationsAndAssignBackTrack(SqlString.GetParameters()).ToArray());
}
- protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IParameterSpecification> parameterSpecs, RowSelection processedRowSelection, IDictionary<string, TypedValue> parameters, IDictionary<string, int[]> namedParameterLocMap)
+ protected SqlString GetSubSelectWithLimits(SqlString subquery, ICollection<IParameterSpecification> parameterSpecs, RowSelection processedRowSelection, IDictionary<string, TypedValue> parameters)
{
ISessionFactoryImplementor sessionFactory = Factory;
Dialect.Dialect dialect = sessionFactory.Dialect;
@@ -92,7 +92,6 @@
skipSqlParameter = Parameter.Placeholder;
skipSqlParameter.BackTrack = skipParameter.GetIdsForBackTrack(sessionFactory).First();
parameters.Add(skipParameterName, new TypedValue(skipParameter.ExpectedType, skip.Value, EntityMode.Poco));
- namedParameterLocMap.Add(skipParameterName, new int[0]);
parameterSpecs.Add(skipParameter);
}
if (take.HasValue)
@@ -102,7 +101,6 @@
takeSqlParameter = Parameter.Placeholder;
takeSqlParameter.BackTrack = takeParameter.GetIdsForBackTrack(sessionFactory).First();
parameters.Add(takeParameterName, new TypedValue(takeParameter.ExpectedType, take.Value, EntityMode.Poco));
- namedParameterLocMap.Add(takeParameterName, new int[0]);
parameterSpecs.Add(takeParameter);
}
// The dialect can move the given parameters where he need, what it can't do is generates new parameters loosing the BackTrack.
Modified: trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectCollectionLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -13,14 +13,13 @@
{
private const int BatchSizeForSubselectFetching = 1;
private readonly object[] keys;
- private readonly IDictionary<string, int[]> namedParameterLocMap;
private readonly IDictionary<string, TypedValue> namedParameters;
private readonly IType[] types;
private readonly object[] values;
private readonly List<IParameterSpecification> parametersSpecifications;
public SubselectCollectionLoader(IQueryableCollection persister, SqlString subquery, ICollection<EntityKey> entityKeys,
- QueryParameters queryParameters, IDictionary<string, int[]> namedParameterLocMap,
+ QueryParameters queryParameters,
ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters)
: base(persister, BatchSizeForSubselectFetching, factory, enabledFilters)
{
@@ -33,7 +32,6 @@
// NH Different behavior: to deal with positionslParameter+NamedParameter+ParameterOfFilters
namedParameters = new Dictionary<string, TypedValue>(queryParameters.NamedParameters);
- this.namedParameterLocMap = new Dictionary<string, int[]>(namedParameterLocMap);
parametersSpecifications = queryParameters.ProcessedSqlParameters.ToList();
var processedRowSelection = queryParameters.ProcessedRowSelection;
SqlString finalSubquery = subquery;
@@ -41,7 +39,7 @@
{
// when the original query has an "ORDER BY" we can't re-apply the pagination
// this is a simplification, we should actually check which is the "ORDER BY" clause because when the "ORDER BY" is just for the PK we can re-apply "ORDER BY" and pagination.
- finalSubquery = GetSubSelectWithLimits(subquery, parametersSpecifications, processedRowSelection, namedParameters, this.namedParameterLocMap);
+ finalSubquery = GetSubSelectWithLimits(subquery, parametersSpecifications, processedRowSelection, namedParameters);
}
InitializeFromWalker(persister, finalSubquery, BatchSizeForSubselectFetching, enabledFilters, factory);
@@ -56,7 +54,7 @@
public override int[] GetNamedParameterLocs(string name)
{
- return namedParameterLocMap[name];
+ return new int[0];
}
protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()
Modified: trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Loader/Collection/SubselectOneToManyLoader.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -15,14 +15,13 @@
{
private const int BatchSizeForSubselectFetching = 1;
private readonly object[] keys;
- private readonly IDictionary<string, int[]> namedParameterLocMap;
private readonly IDictionary<string, TypedValue> namedParameters;
private readonly IType[] types;
private readonly object[] values;
private readonly List<IParameterSpecification> parametersSpecifications;
public SubselectOneToManyLoader(IQueryableCollection persister, SqlString subquery, ICollection<EntityKey> entityKeys,
- QueryParameters queryParameters, IDictionary<string, int[]> namedParameterLocMap,
+ QueryParameters queryParameters,
ISessionFactoryImplementor factory, IDictionary<string, IFilter> enabledFilters)
: base(persister, BatchSizeForSubselectFetching, factory, enabledFilters)
{
@@ -35,7 +34,6 @@
// NH Different behavior: to deal with positionslParameter+NamedParameter+ParameterOfFilters
namedParameters = new Dictionary<string, TypedValue>(queryParameters.NamedParameters);
- this.namedParameterLocMap = new Dictionary<string, int[]>(namedParameterLocMap);
parametersSpecifications = queryParameters.ProcessedSqlParameters.ToList();
var processedRowSelection = queryParameters.ProcessedRowSelection;
SqlString finalSubquery = subquery;
@@ -43,7 +41,7 @@
{
// when the original query has an "ORDER BY" we can't re-apply the pagination.
// This is a simplification, we should actually check which is the "ORDER BY" clause because when the "ORDER BY" is just for the PK we can re-apply "ORDER BY" and pagination.
- finalSubquery = GetSubSelectWithLimits(subquery, parametersSpecifications, processedRowSelection, namedParameters, this.namedParameterLocMap);
+ finalSubquery = GetSubSelectWithLimits(subquery, parametersSpecifications, processedRowSelection, namedParameters);
}
InitializeFromWalker(persister, finalSubquery, BatchSizeForSubselectFetching, enabledFilters, factory);
@@ -58,7 +56,7 @@
public override int[] GetNamedParameterLocs(string name)
{
- return namedParameterLocMap[name];
+ return new int[0];
}
protected override IEnumerable<IParameterSpecification> GetParameterSpecifications()
Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -521,8 +521,6 @@
ISet<EntityKey>[] keySets = Transpose(keys);
- IDictionary<string, int[]> namedParameterLocMap = BuildNamedParameterLocMap(queryParameters);
-
ILoadable[] loadables = EntityPersisters;
string[] aliases = Aliases;
@@ -533,7 +531,7 @@
if (rowKeys[i] != null && loadables[i].HasSubselectLoadableCollections)
{
SubselectFetch subselectFetch =
- new SubselectFetch(aliases[i], loadables[i], queryParameters, keySets[i], namedParameterLocMap);
+ new SubselectFetch(aliases[i], loadables[i], queryParameters, keySets[i]);
session.PersistenceContext.BatchFetchQueue.AddSubselect(rowKeys[i], subselectFetch);
}
@@ -542,23 +540,6 @@
}
}
- private IDictionary<string, int[]> BuildNamedParameterLocMap(QueryParameters queryParameters)
- {
- if (queryParameters.NamedParameters != null)
- {
- IDictionary<string, int[]> namedParameterLocMap = new Dictionary<string, int[]>();
- foreach (string name in queryParameters.NamedParameters.Keys)
- {
- namedParameterLocMap[name] = GetNamedParameterLocs(name);
- }
- return namedParameterLocMap;
- }
- else
- {
- return null;
- }
- }
-
internal void InitializeEntitiesAndCollections(IList hydratedObjects, object resultSetId, ISessionImplementor session, bool readOnly)
{
ICollectionPersister[] collectionPersisters = CollectionPersisters;
Modified: trunk/nhibernate/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Persister/Collection/BasicCollectionPersister.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -300,7 +300,7 @@
{
return
new SubselectCollectionLoader(this, subselect.ToSubselectString(CollectionType.LHSPropertyName), subselect.Result,
- subselect.QueryParameters, subselect.NamedParameterLocMap, session.Factory,
+ subselect.QueryParameters, session.Factory,
session.EnabledFilters);
}
Modified: trunk/nhibernate/src/NHibernate/Persister/Collection/OneToManyPersister.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Persister/Collection/OneToManyPersister.cs 2011-06-18 12:59:25 UTC (rev 5947)
+++ trunk/nhibernate/src/NHibernate/Persister/Collection/OneToManyPersister.cs 2011-06-18 13:14:46 UTC (rev 5948)
@@ -382,7 +382,7 @@
{
return
new SubselectOneToManyLoader(this, subselect.ToSubselectString(CollectionType.LHSPropertyName), subselect.Result,
- subselect.QueryParameters, subselect.NamedParameterLocMap, session.Factory,
+ subselect.QueryParameters, session.Factory,
session.EnabledFilters);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
