[Nhibernate-commit] nhibernate/src/NHibernate/Hql QueryTranslator.cs,1.50,1.51

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15968/NHibernate/Hql

Modified Files:
	QueryTranslator.cs 
Log Message:
Added a lock inside a method that might be called by multiple threads
and modifies a class scoped field.

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** QueryTranslator.cs	4 Dec 2004 22:41:20 -0000	1.50
--- QueryTranslator.cs	27 Dec 2004 03:53:52 -0000	1.51
***************
*** 4,10 ****
  using System.Reflection;
  using System.Runtime.CompilerServices;
- using System.Runtime.Serialization;
  using System.Text;
- using System.Text.RegularExpressions;

  using Iesi.Collections;
--- 4,8 ----
***************
*** 72,75 ****
--- 70,83 ----
  		private bool compiled; //protected 
  		private SqlCommand.SqlString sqlString;
+ 
+ 		/// <summary>
+ 		/// Indicates if the SqlString has been fully populated - it goes
+ 		/// through a 2 phase process.  The first part is the parsing of the
+ 		/// hql and it puts in placeholders for the parameters, the second phase 
+ 		/// puts in the actual types for the parameters.  The completion of 
+ 		/// the second phase is when <c>isSqlStringPopulated==true</c>.
+ 		/// </summary>
+ 		private bool isSqlStringPopulated;
+ 
  		private System.Type holderClass;
  		private ConstructorInfo holderConstructor;
***************
*** 1237,1240 ****
--- 1245,1250 ----
  		}

+ 		private object prepareCommandLock = new object();
+ 
  		/// <summary>
  		/// Creates an IDbCommand object and populates it with the values necessary to execute it against the 
***************
*** 1254,1364 ****
  		protected override IDbCommand PrepareCommand(SqlString sqlString, QueryParameters parameters, bool scroll, ISessionImplementor session) 
  		{
! 			SqlString sql = null;
! 
! 			// when there is no untyped Parameters then we can avoid the need to create
! 			// a new sql string and just return the existing one because it is ready 
! 			// to be prepared and executed.
! 			if(sqlString.ContainsUntypedParameter==false) 
! 			{
! 				sql = sqlString;
! 			}
! 			else 
  			{

! 				// holds the index of the sqlPart that should be replaced
! 				int sqlPartIndex = 0;
! 
! 				// holds the index of the paramIndexes array that is the current position
! 				int paramIndex = 0;

! 				sql = sqlString.Clone();
! 				int[] paramIndexes = sql.ParameterIndexes;

! 				// if there are no Parameters in the SqlString then there is no reason to 
! 				// bother with this code.
! 				if( paramIndexes.Length > 0 ) 
! 				{
! 				
! 					for( int i=0; i<parameters.PositionalParameterTypes.Length; i++ ) 
! 					{
! 						string[] colNames = new string[ parameters.PositionalParameterTypes[i].GetColumnSpan(factory)];
! 						for( int j=0; j<colNames.Length; j++ ) 
! 						{
! 							colNames[j] = "p" + paramIndex.ToString() + j.ToString();
! 						}

! 						Parameter[] sqlParameters = Parameter.GenerateParameters( factory, colNames , parameters.PositionalParameterTypes[i] );

! 						foreach(Parameter param in sqlParameters) 
  						{
- 							sqlPartIndex = paramIndexes[paramIndex];
- 							sql.SqlParts[sqlPartIndex] = param;

! 							paramIndex++;
! 						}
! 					}

! 					if( parameters.NamedParameters!=null && parameters.NamedParameters.Count > 0 ) 
! 					{
! 						// convert the named parameters to an array of types
! 						ArrayList paramTypeList = new ArrayList();
! 				
! 						foreach( DictionaryEntry e in parameters.NamedParameters ) 
! 						{
! 							string name = (string) e.Key;
! 							TypedValue typedval = (TypedValue) e.Value;
! 							int[] locs = GetNamedParameterLocs(name);

! 							for( int i=0; i<locs.Length; i++ ) 
! 							{
! 								int lastInsertedIndex = paramTypeList.Count;

! 								int insertAt = locs[i];

! 								// need to make sure that the ArrayList is populated with null objects
! 								// up to the index we are about to add the values into.  An Index Out 
! 								// of Range exception will be thrown if we add an element at an index
! 								// that is greater than the Count.
! 								if(insertAt >= lastInsertedIndex)
  								{
! 									for(int j=lastInsertedIndex; j<=insertAt; j++) 
  									{
! 										paramTypeList.Add(null);
  									}
  								}
- 						
- 								paramTypeList[insertAt] = typedval.Type; 
- 							}
- 						}

! 						for( int i=0; i<paramTypeList.Count; i++ ) 
! 						{
! 							IType type = (IType)paramTypeList[i];
! 							string[] colNames = new string[type.GetColumnSpan(factory)];

! 							for( int j=0; j<colNames.Length; j++ ) 
! 							{
! 								colNames[j] = "p" + paramIndex.ToString() + j.ToString();
! 							}

! 							Parameter[] sqlParameters = Parameter.GenerateParameters( factory, colNames , type );

! 							foreach(Parameter param in sqlParameters) 
! 							{
! 								sqlPartIndex = paramIndexes[paramIndex];
! 								sql.SqlParts[sqlPartIndex] = param;
! 						
! 								paramIndex++;
  							}
  						}
  					}
  				}
  			}

! 			// replace the local field used by the SqlString property with the one we just built 
! 			// that has the correct parameters
! 			this.sqlString = sql;
! 
! 			return base.PrepareCommand(sql, parameters, scroll, session);
  		}
  	}
--- 1264,1381 ----
  		protected override IDbCommand PrepareCommand(SqlString sqlString, QueryParameters parameters, bool scroll, ISessionImplementor session) 
  		{
! 			lock( prepareCommandLock ) 
  			{
+ 				if( !isSqlStringPopulated ) 
+ 				{
+ 					SqlString sql = null;

! 					// when there is no untyped Parameters then we can avoid the need to create
! 					// a new sql string and just return the existing one because it is ready 
! 					// to be prepared and executed.
! 					if(sqlString.ContainsUntypedParameter==false) 
! 					{
! 						sql = sqlString;
! 					}
! 					else 
! 					{

! 						// holds the index of the sqlPart that should be replaced
! 						int sqlPartIndex = 0;

! 						// holds the index of the paramIndexes array that is the current position
! 						int paramIndex = 0;

! 						sql = sqlString.Clone();
! 						int[] paramIndexes = sql.ParameterIndexes;

! 						// if there are no Parameters in the SqlString then there is no reason to 
! 						// bother with this code.
! 						if( paramIndexes.Length > 0 ) 
  						{

! 							for( int i=0; i<parameters.PositionalParameterTypes.Length; i++ ) 
! 							{
! 								string[] colNames = new string[ parameters.PositionalParameterTypes[i].GetColumnSpan(factory)];
! 								for( int j=0; j<colNames.Length; j++ ) 
! 								{
! 									colNames[j] = "p" + paramIndex.ToString() + j.ToString();
! 								}

! 								Parameter[] sqlParameters = Parameter.GenerateParameters( factory, colNames , parameters.PositionalParameterTypes[i] );

! 								foreach(Parameter param in sqlParameters) 
! 								{
! 									sqlPartIndex = paramIndexes[paramIndex];
! 									sql.SqlParts[sqlPartIndex] = param;
! 								
! 									paramIndex++;
! 								}
! 							}

! 							if( parameters.NamedParameters!=null && parameters.NamedParameters.Count > 0 ) 
! 							{
! 								// convert the named parameters to an array of types
! 								ArrayList paramTypeList = new ArrayList();

! 								foreach( DictionaryEntry e in parameters.NamedParameters ) 
  								{
! 									string name = (string) e.Key;
! 									TypedValue typedval = (TypedValue) e.Value;
! 									int[] locs = GetNamedParameterLocs(name);
! 
! 									for( int i=0; i<locs.Length; i++ ) 
  									{
! 										int lastInsertedIndex = paramTypeList.Count;
! 
! 										int insertAt = locs[i];
! 								
! 										// need to make sure that the ArrayList is populated with null objects
! 										// up to the index we are about to add the values into.  An Index Out 
! 										// of Range exception will be thrown if we add an element at an index
! 										// that is greater than the Count.
! 										if(insertAt >= lastInsertedIndex)
! 										{
! 											for(int j=lastInsertedIndex; j<=insertAt; j++) 
! 											{
! 												paramTypeList.Add(null);
! 											}
! 										}
! 								
! 										paramTypeList[insertAt] = typedval.Type; 
  									}
  								}

! 								for( int i=0; i<paramTypeList.Count; i++ ) 
! 								{
! 									IType type = (IType)paramTypeList[i];
! 									string[] colNames = new string[type.GetColumnSpan(factory)];

! 									for( int j=0; j<colNames.Length; j++ ) 
! 									{
! 										colNames[j] = "p" + paramIndex.ToString() + j.ToString();
! 									}

! 									Parameter[] sqlParameters = Parameter.GenerateParameters( factory, colNames , type );

! 									foreach(Parameter param in sqlParameters) 
! 									{
! 										sqlPartIndex = paramIndexes[paramIndex];
! 										sql.SqlParts[sqlPartIndex] = param;
! 								
! 										paramIndex++;
! 									}
! 								}
  							}
  						}
  					}
+ 
+ 					// replace the local field used by the SqlString property with the one we just built 
+ 					// that has the correct parameters
+ 					this.sqlString = sql;
+ 					isSqlStringPopulated = true;
  				}
  			}

! 			return base.PrepareCommand( this.sqlString, parameters, scroll, session );
  		}
  	}