Merge pull request #395 from bgrainger/reorganise

Improve internal code organisation. Fixes #376

Author: bgrainger

src/MySqlConnector/MySqlClient/Caches/CachedParameter.cs renamed to src/MySqlConnector/Core/CachedParameter.cs

@@ -1,10 +1,9 @@
 using System.Data;
 using System.Linq;
-using MySql.Data.MySqlClient.Types;
 
-namespace MySql.Data.MySqlClient.Caches
+namespace MySqlConnector.Core
 {
-	internal class CachedParameter
+	internal sealed class CachedParameter
 	{
 		public CachedParameter(int ordinalPosition, string mode, string name, string dataType, bool unsigned)
 		{

src/MySqlConnector/MySqlClient/Caches/CachedProcedure.cs renamed to src/MySqlConnector/Core/CachedProcedure.cs

@@ -5,11 +5,12 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MySql.Data.Protocol.Serialization;
+using MySql.Data.MySqlClient;
+using MySqlConnector.Protocol.Serialization;
 
-namespace MySql.Data.MySqlClient.Caches
+namespace MySqlConnector.Core
 {
-	internal class CachedProcedure
+	internal sealed class CachedProcedure
 	{
 		internal static async Task<CachedProcedure> FillAsync(IOBehavior ioBehavior, MySqlConnection connection, string schema, string component, CancellationToken cancellationToken)
 		{
@@ -50,7 +51,7 @@ FROM information_schema.parameters
 			return new CachedProcedure(schema, component, parameters.AsReadOnly());
 		}
 
-		protected CachedProcedure(string schema, string component, ReadOnlyCollection<CachedParameter> parameters)
+		private CachedProcedure(string schema, string component, ReadOnlyCollection<CachedParameter> parameters)
 		{
 			m_schema = schema;
 			m_component = component;

src/MySqlConnector/MySqlClient/Types/ColumnTypeMetadata.cs renamed to src/MySqlConnector/Core/ColumnTypeMetadata.cs

@@ -1,4 +1,6 @@
-namespace MySql.Data.MySqlClient.Types
+using MySql.Data.MySqlClient;
+
+namespace MySqlConnector.Core
 {
 	internal sealed class ColumnTypeMetadata
 	{

src/MySqlConnector/MySqlClient/ConnectionPool.cs renamed to src/MySqlConnector/Core/ConnectionPool.cs

@@ -4,14 +4,14 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MySql.Data.Protocol.Serialization;
-using MySql.Data.Serialization;
+using MySql.Data.MySqlClient;
+using MySqlConnector.Protocol.Serialization;
 
-namespace MySql.Data.MySqlClient
+namespace MySqlConnector.Core
 {
 	internal sealed class ConnectionPool
 	{
-		public async Task<MySqlSession> GetSessionAsync(MySqlConnection connection, IOBehavior ioBehavior, CancellationToken cancellationToken)
+		public async Task<ServerSession> GetSessionAsync(MySqlConnection connection, IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 
@@ -33,7 +33,7 @@ public async Task<MySqlSession> GetSessionAsync(MySqlConnection connection, IOBe
 			try
 			{
 				// check for a waiting session
-				MySqlSession session = null;
+				ServerSession session = null;
 				lock (m_sessions)
 				{
 					if (m_sessions.Count > 0)
@@ -79,7 +79,7 @@ public async Task<MySqlSession> GetSessionAsync(MySqlConnection connection, IOBe
 				}
 
 				// create a new session
-				session = new MySqlSession(this, m_generation, Interlocked.Increment(ref m_lastId));
+				session = new ServerSession(this, m_generation, Interlocked.Increment(ref m_lastId));
 				await session.ConnectAsync(m_connectionSettings, m_loadBalancer, ioBehavior, cancellationToken).ConfigureAwait(false);
 				AdjustHostConnectionCount(session, 1);
 				session.OwningConnection = new WeakReference<MySqlConnection>(connection);
@@ -94,7 +94,7 @@ public async Task<MySqlSession> GetSessionAsync(MySqlConnection connection, IOBe
 			}
 		}
 
-		private bool SessionIsHealthy(MySqlSession session)
+		private bool SessionIsHealthy(ServerSession session)
 		{
 			if (!session.IsConnected)
 				return false;
@@ -109,7 +109,7 @@ private bool SessionIsHealthy(MySqlSession session)
 			return true;
 		}
 
-		public void Return(MySqlSession session)
+		public void Return(ServerSession session)
 		{
 			try
 			{
@@ -150,13 +150,13 @@ public async Task ReapAsync(IOBehavior ioBehavior, CancellationToken cancellatio
 		}
 
 		/// <summary>
-		/// Examines all the <see cref="MySqlSession"/> objects in <see cref="m_leasedSessions"/> to determine if any
+		/// Examines all the <see cref="ServerSession"/> objects in <see cref="m_leasedSessions"/> to determine if any
 		/// have an owning <see cref="MySqlConnection"/> that has been garbage-collected. If so, assumes that the connection 
 		/// was not properly disposed and returns the session to the pool.
 		/// </summary>
 		private void RecoverLeakedSessions()
 		{
-			var recoveredSessions = new List<MySqlSession>();
+			var recoveredSessions = new List<ServerSession>();
 			lock (m_leasedSessions)
 			{
 				m_lastRecoveryTime = unchecked((uint) Environment.TickCount);
@@ -170,7 +170,7 @@ private void RecoverLeakedSessions()
 				session.ReturnToPool();
 		}
 
-		private async Task CleanPoolAsync(IOBehavior ioBehavior, Func<MySqlSession, bool> shouldCleanFn, bool respectMinPoolSize, CancellationToken cancellationToken)
+		private async Task CleanPoolAsync(IOBehavior ioBehavior, Func<ServerSession, bool> shouldCleanFn, bool respectMinPoolSize, CancellationToken cancellationToken)
 		{
 			// synchronize access to this method as only one clean routine should be run at a time
 			if (ioBehavior == IOBehavior.Asynchronous)
@@ -204,7 +204,7 @@ private async Task CleanPoolAsync(IOBehavior ioBehavior, Func<MySqlSession, bool
 					try
 					{
 						// check for a waiting session
-						MySqlSession session = null;
+						ServerSession session = null;
 						lock (m_sessions)
 						{
 							if (m_sessions.Count > 0)
@@ -267,7 +267,7 @@ private async Task CreateMinimumPooledSessions(IOBehavior ioBehavior, Cancellati
 
 				try
 				{
-					var session = new MySqlSession(this, m_generation, Interlocked.Increment(ref m_lastId));
+					var session = new ServerSession(this, m_generation, Interlocked.Increment(ref m_lastId));
 					await session.ConnectAsync(m_connectionSettings, m_loadBalancer, ioBehavior, cancellationToken).ConfigureAwait(false);
 					AdjustHostConnectionCount(session, 1);
 					lock (m_sessions)
@@ -313,8 +313,8 @@ private ConnectionPool(ConnectionSettings cs)
 			m_generation = 0;
 			m_cleanSemaphore = new SemaphoreSlim(1);
 			m_sessionSemaphore = new SemaphoreSlim(cs.MaximumPoolSize);
-			m_sessions = new LinkedList<MySqlSession>();
-			m_leasedSessions = new Dictionary<int, MySqlSession>();
+			m_sessions = new LinkedList<ServerSession>();
+			m_leasedSessions = new Dictionary<int, ServerSession>();
 			if (cs.LoadBalance == MySqlLoadBalance.FewestConnections)
 			{
 				m_hostSessions = new Dictionary<string, int>();
@@ -328,7 +328,7 @@ private ConnectionPool(ConnectionSettings cs)
 				(ILoadBalancer) new RoundRobinLoadBalancer();
 		}
 
-		private void AdjustHostConnectionCount(MySqlSession session, int delta)
+		private void AdjustHostConnectionCount(ServerSession session, int delta)
 		{
 			if (m_hostSessions != null)
 			{
@@ -375,9 +375,9 @@ public IEnumerable<string> LoadBalance(IReadOnlyList<string> hosts)
 		int m_generation;
 		readonly SemaphoreSlim m_cleanSemaphore;
 		readonly SemaphoreSlim m_sessionSemaphore;
-		readonly LinkedList<MySqlSession> m_sessions;
+		readonly LinkedList<ServerSession> m_sessions;
 		readonly ConnectionSettings m_connectionSettings;
-		readonly Dictionary<int, MySqlSession> m_leasedSessions;
+		readonly Dictionary<int, ServerSession> m_leasedSessions;
 		readonly ILoadBalancer m_loadBalancer;
 		readonly Dictionary<string, int> m_hostSessions;
 		int m_lastId;

src/MySqlConnector/Serialization/ConnectionSettings.cs renamed to src/MySqlConnector/Core/ConnectionSettings.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using MySql.Data.MySqlClient;
+using MySqlConnector.Utilities;
 
-namespace MySql.Data.Serialization
+namespace MySqlConnector.Core
 {
 	internal sealed class ConnectionSettings
 	{

src/MySqlConnector/Serialization/ConnectionType.cs renamed to src/MySqlConnector/Core/ConnectionType.cs

@@ -1,4 +1,4 @@
-namespace MySql.Data.Serialization
+namespace MySqlConnector.Core
 {
 	/// <summary>
 	/// Specifies whether to perform synchronous or asynchronous I/O.

src/MySqlConnector/MySqlClient/Types/DbTypeMapping.cs renamed to src/MySqlConnector/Core/DbTypeMapping.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Data;
 
-namespace MySql.Data.MySqlClient.Types
+namespace MySqlConnector.Core
 {
 	internal sealed class DbTypeMapping
 	{

src/MySqlConnector/MySqlClient/CommandExecutors/ICommandExecutor.cs renamed to src/MySqlConnector/Core/ICommandExecutor.cs

@@ -1,10 +1,11 @@
-using System.Data;
+using System.Data;
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
-using MySql.Data.Protocol.Serialization;
+using MySql.Data.MySqlClient;
+using MySqlConnector.Protocol.Serialization;
 
-namespace MySql.Data.MySqlClient.CommandExecutors
+namespace MySqlConnector.Core
 {
 	internal interface ICommandExecutor
 	{

src/MySqlConnector/Serialization/ILoadBalancer.cs renamed to src/MySqlConnector/Core/ILoadBalancer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MySql.Data.Serialization
+namespace MySqlConnector.Core
 {
 	internal interface ILoadBalancer
 	{

src/MySqlConnector/MySqlClient/MySqlXaTransaction.cs renamed to src/MySqlConnector/Core/MySqlXaTransaction.cs

@@ -3,8 +3,9 @@
 using System.Globalization;
 using System.Threading;
 using System.Transactions;
+using MySql.Data.MySqlClient;
 
-namespace MySql.Data.MySqlClient
+namespace MySqlConnector.Core
 {
 	internal sealed class MySqlXaTransaction : IEnlistmentNotification
 	{