Rename "Stream" to "Source".

This prepares for other types of sources to be added.

Author: bgrainger

src/MySqlConnector/Core/ResultSet.cs

@@ -72,19 +72,26 @@ public async Task ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 							if (!Connection.AllowLoadLocalInfile)
 								throw new NotSupportedException("To use LOAD DATA LOCAL INFILE, set AllowLoadLocalInfile=true in the connection string. See https://fl.vu/mysql-load-data");
 							var localInfile = LocalInfilePayload.Create(payload.Span);
-							if (!IsHostVerified(Connection)
-								&& !localInfile.FileName.StartsWith(MySqlBulkLoader.StreamPrefix, StringComparison.Ordinal))
+							var hasSourcePrefix = localInfile.FileName.StartsWith(MySqlBulkLoader.SourcePrefix, StringComparison.Ordinal);
+							if (!IsHostVerified(Connection) && !hasSourcePrefix)
 								throw new NotSupportedException("Use SourceStream or SslMode >= VerifyCA for LOAD DATA LOCAL INFILE. See https://fl.vu/mysql-load-data");
 
-							using var stream = localInfile.FileName.StartsWith(MySqlBulkLoader.StreamPrefix, StringComparison.Ordinal) ?
-								MySqlBulkLoader.GetAndRemoveStream(localInfile.FileName) :
+							var source = hasSourcePrefix ?
+								MySqlBulkLoader.GetAndRemoveSource(localInfile.FileName) :
 								File.OpenRead(localInfile.FileName);
-							var readBuffer = new byte[65536];
-							int byteCount;
-							while ((byteCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false)) > 0)
+
+							if (source is Stream stream)
 							{
-								payload = new PayloadData(new ArraySegment<byte>(readBuffer, 0, byteCount));
-								await Session.SendReplyAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
+								using (stream)
+								{
+									var readBuffer = new byte[65536];
+									int byteCount;
+									while ((byteCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false)) > 0)
+									{
+										payload = new PayloadData(new ArraySegment<byte>(readBuffer, 0, byteCount));
+										await Session.SendReplyAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
+									}
+								}
 							}
 						}
 						catch (Exception ex)

src/MySqlConnector/MySql.Data.MySqlClient/MySqlBulkLoader.cs

@@ -16,7 +16,7 @@ public sealed class MySqlBulkLoader
 		private const char defaultEscapeCharacter = '\\';
 
 		private static readonly object s_lock = new object();
-		private static readonly Dictionary<string, Stream> s_streams = new Dictionary<string, Stream>();
+		private static readonly Dictionary<string, object> s_sources = new Dictionary<string, object>();
 
 		public string? CharacterSet { get; set; }
 		public List<string> Columns { get; }
@@ -165,7 +165,7 @@ private async Task<int> LoadAsync(IOBehavior ioBehavior, CancellationToken cance
 
 				FileName = GenerateSourceStreamName();
 				lock (s_lock)
-					s_streams.Add(FileName, SourceStream);
+					s_sources.Add(FileName, SourceStream);
 			}
 
 			if (string.IsNullOrWhiteSpace(FileName) || string.IsNullOrWhiteSpace(TableName))
@@ -203,12 +203,7 @@ private async Task<int> LoadAsync(IOBehavior ioBehavior, CancellationToken cance
 			finally
 			{
 				if (closeStream)
-				{
-					using (GetAndRemoveStream(FileName!))
-					{
-						// close the stream
-					}
-				}
+					((IDisposable) GetAndRemoveSource(FileName!)).Dispose();
 
 				if (closeConnection)
 					Connection.Close();
@@ -229,17 +224,17 @@ private Stream CreateFileStream(string fileName)
 
 		private static string GenerateSourceStreamName()
 		{
-			return StreamPrefix + Guid.NewGuid().ToString("N");
+			return SourcePrefix + Guid.NewGuid().ToString("N");
 		}
 
-		internal const string StreamPrefix = ":STREAM:";
+		internal const string SourcePrefix = ":SOURCE:";
 
-		internal static Stream GetAndRemoveStream(string streamKey)
+		internal static object GetAndRemoveSource(string sourceKey)
 		{
 			lock (s_lock)
 			{
-				var stream = s_streams[streamKey];
-				s_streams.Remove(streamKey);
+				var stream = s_sources[sourceKey];
+				s_sources.Remove(sourceKey);
 				return stream;
 			}
 		}