Avoid carrying named parameters collection around

Author: hazzik

src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs

@@ -58,7 +58,6 @@ public partial class HqlSqlWalker
 		private readonly LiteralProcessor _literalProcessor;
 
 		private readonly IDictionary<string, string> _tokenReplacements;
-		private readonly IDictionary<string, NamedParameter> _namedParameters;
 		private readonly IDictionary<IParameterSpecification, IType> _guessedParameterTypes = new Dictionary<IParameterSpecification, IType>();
 
 		private JoinType _impliedJoinType;
@@ -68,32 +67,20 @@ public partial class HqlSqlWalker
 		private IASTFactory _nodeFactory;
 		private readonly List<AssignmentSpecification> assignmentSpecifications = new List<AssignmentSpecification>();
 		private int numberOfParametersInSetClause;
-		private Stack<int> clauseStack=new Stack<int>();
+		private Stack<int> clauseStack = new Stack<int>();
 
 		public HqlSqlWalker(
 			QueryTranslatorImpl qti,
 			ISessionFactoryImplementor sfi,
 			ITreeNodeStream input,
 			IDictionary<string, string> tokenReplacements,
 			string collectionRole)
-			: this(qti, sfi, input, tokenReplacements, null, collectionRole)
-		{
-		}
-
-		internal HqlSqlWalker(
-			QueryTranslatorImpl qti,
-			ISessionFactoryImplementor sfi,
-			ITreeNodeStream input,
-			IDictionary<string, string> tokenReplacements,
-			IDictionary<string, NamedParameter> namedParameters,
-			string collectionRole)
 			: this(input)
 		{
 			_sessionFactoryHelper = new SessionFactoryHelperExtensions(sfi);
 			_qti = qti;
 			_literalProcessor = new LiteralProcessor(this);
 			_tokenReplacements = tokenReplacements;
-			_namedParameters = namedParameters;
 			_collectionFilterRole = collectionRole;
 		}
 
@@ -1099,7 +1086,7 @@ IASTNode GenerateNamedParameter(IASTNode delimiterNode, IASTNode nameNode)
 			);
 
 			parameter.HqlParameterSpecification = paramSpec;
-			if (_namedParameters != null && _namedParameters.TryGetValue(name, out var namedParameter))
+			if (_qti.TryGetNamedParameter(name, out var namedParameter))
 			{
 				// Add the parameter type information so that we are able to calculate functions return types
 				// when the parameter is used as an argument.

src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs

@@ -459,7 +459,7 @@ private static IStatementExecutor BuildAppropriateStatementExecutor(IStatement s
 
 		private HqlSqlTranslator Analyze(string collectionRole)
 		{
-			var translator = new HqlSqlTranslator(_stageOneAst, this, _factory, _tokenReplacements, _namedParameters, collectionRole);
+			var translator = new HqlSqlTranslator(_stageOneAst, this, _factory, _tokenReplacements, collectionRole);
 
 			translator.Translate();
 
@@ -473,6 +473,17 @@ private void ErrorIfDML()
 				throw new QueryExecutionRequestException("Not supported for DML operations", _queryIdentifier);
 			}
 		}
+
+		internal bool TryGetNamedParameter(string name, out NamedParameter namedParameter)
+		{
+			if (_namedParameters == null)
+			{
+				namedParameter = null;
+				return false;
+			}
+
+			return _namedParameters.TryGetValue(name, out namedParameter);
+		}
 	}
 
 	public class HqlParseEngine
@@ -573,23 +584,20 @@ internal class HqlSqlTranslator
 		private readonly QueryTranslatorImpl _qti;
 		private readonly ISessionFactoryImplementor _sfi;
 		private readonly IDictionary<string, string> _tokenReplacements;
-		private readonly IDictionary<string, NamedParameter> _namedParameters;
 		private readonly string _collectionRole;
 		private IStatement _resultAst;
 
-		public HqlSqlTranslator(
+		internal HqlSqlTranslator(
 			IASTNode ast,
 			QueryTranslatorImpl qti,
 			ISessionFactoryImplementor sfi,
 			IDictionary<string, string> tokenReplacements,
-			IDictionary<string, NamedParameter> namedParameters,
 			string collectionRole)
 		{
 			_inputAst = ast;
 			_qti = qti;
 			_sfi = sfi;
 			_tokenReplacements = tokenReplacements;
-			_namedParameters = namedParameters;
 			_collectionRole = collectionRole;
 		}
 
@@ -609,7 +617,7 @@ public IStatement Translate()
 
 				var nodes = new BufferedTreeNodeStream(_inputAst);
 
-				var hqlSqlWalker = new HqlSqlWalker(_qti, _sfi, nodes, _tokenReplacements, _namedParameters, _collectionRole);
+				var hqlSqlWalker = new HqlSqlWalker(_qti, _sfi, nodes, _tokenReplacements, _collectionRole);
 				hqlSqlWalker.TreeAdaptor = new HqlSqlWalkerTreeAdaptor(hqlSqlWalker);
 
 				try