Removed ConnectionPool from ConnectionProvider and settings

for PreparedStatementCache.


SVN: trunk@934

Author: Mike Doerfler

src/NHibernate/Cfg/Environment.cs

@@ -51,10 +51,16 @@ public class Environment
 		// MikeD added these while synching up SessionFactoryImpl.  Not sure if they have any ado.net
 		// equivalents - we can probably remove these and remove the SessionFactoryImpl code that
 		// uses them.
+		[Obsolete("Removing ConnectionPool from NH")]
 		public const string PoolSize = "hibernate.connection.pool_size";
 		public const string StatementBatchSize = "hibernate.jdbc.batch_size";
 		public const string StatementFetchSize = "hibernate.jdbc.fetch_size";
 		public const string UseScrollableResultSet = "hibernate.jdbc.use_scrollable_resultset";
+
+		// going to remove this - the DataProvider should implement their own IDbCommand
+		// caching, not NHibernate
+		[Obsolete("Removing StatementCache from NH")]
+		public const string StatementCacheSize = "hibernate.statement_cache.size";
 
 		static Environment() 
 		{

src/NHibernate/Connection/ConnectionProvider.cs

@@ -14,7 +14,6 @@ public abstract class ConnectionProvider : IConnectionProvider, IDisposable
 	{
 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ConnectionProvider));
 		private string connString = null;
-		private int poolSize;
 		protected IDriver driver = null;
 
 		public virtual void CloseConnection(IDbConnection conn) 
@@ -39,13 +38,6 @@ public virtual void Configure(IDictionary settings)
 		{
 			log.Info( "Configuring ConnectionProvider" );
 
-			// default the poolSize to 0 if no setting was made because most of the .net DataProvider
-			// do their own connection pooling.  This would be useful to change to some higher number
-			// if the .net DataProvider did not provide their own connection pooling.  I don't know of
-			// any instances of this yet.
-			poolSize = PropertiesHelper.GetInt32( Cfg.Environment.PoolSize, settings, 0 );
-			log.Info( "NHibernate connection pool size: " + poolSize );
-
 			connString = settings[ Cfg.Environment.ConnectionString ] as string;
 			if (connString==null) 
 			{
@@ -86,11 +78,6 @@ protected virtual string ConnectionString
 			get { return connString;}
 		}
 
-		protected virtual int PoolSize 
-		{
-			get { return poolSize; }
-		}
-
 		public IDriver Driver 
 		{
 			get {return driver;}

src/NHibernate/Connection/DriverConnectionProvider.cs

@@ -9,43 +9,17 @@ namespace NHibernate.Connection
 	/// <summary>
 	/// A ConnectionProvider that uses an IDriver to create connections.
 	/// </summary>
-	/// <remarks>
-	/// This IConnectionProvider implements a rudimentary connection pool.
-	/// </remarks>
 	public class DriverConnectionProvider : ConnectionProvider
 	{
 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(DriverConnectionProvider));
-		private static object poolLock = new object();
-		private readonly ArrayList pool = new ArrayList();
 
-		private int checkedOut = 0;
-
 		public DriverConnectionProvider()
 		{
 		}
 
 
 		public override IDbConnection GetConnection() 
 		{
-			if(log.IsDebugEnabled) log.Debug("total checked-out connections: " + checkedOut);
-
-			lock(poolLock) 
-			{
-				if( pool.Count > 0 ) 
-				{
-					int last = pool.Count - 1;
-					if(log.IsDebugEnabled) 
-					{
-						log.Debug("using pooled connection, pool size: " + last);
-						checkedOut++;
-					}
-
-					IDbConnection conn = (IDbConnection)pool[last];
-					pool.RemoveAt(last);
-					return conn;
-				}
-			}
-
 			log.Debug("Obtaining IDbConnection from Driver");
 			try 
 			{
@@ -68,38 +42,13 @@ public override bool IsStatementCache
 		public override void Close()
 		{
 			log.Info("cleaning up connection pool");
-
-			for(int i = 0; i < pool.Count; i++) 
-			{
-				try 
-				{
-					((IDbConnection)pool[i]).Close();
-				}
-				catch(Exception e) 
-				{
-					log.Warn("problem closing pooled connection", e);
-				}
-			}
-
-			pool.Clear();
 		}
 
 		public override void CloseConnection(IDbConnection conn)
 		{
-			if(log.IsDebugEnabled) checkedOut--;
-
-			lock(poolLock) 
-			{
-				int currentSize = pool.Count;
-				if( currentSize < PoolSize ) 
-				{
-					if(log.IsDebugEnabled) log.Debug("returning connection to pool, pool size: " + (currentSize + 1) );
-					pool.Add(conn);
-					return;
-				}
-			}
-
 			base.CloseConnection(conn);
+			//TODO: make sure I want to do this - pretty sure I do because of Oracle problems.
+			conn.Dispose();
 		}