MariaDB version parsing evolution

fix #1259

Since MariaDB server 11.0.1 (MDEV-28910) won't have "5.5.5-" prefix anymore.
This PR propose to evolve server identification accordingly based on 2 principles:
* version is stripped of "5.5.5-" prefix and identified as MariaDB (The only server that use 'x.y.z-' prefix is percona, but first percona 5.5 server was 5.5.7). MySQL use "x.y.z", alibaba and aurora use x.y.z.a notation)
* server version string contains "MariaDB"

(All mariadb connectors use/will use that exact same behavior for mariadb identification)

Signed-off-by: rusher <[email protected]>
(cherry picked from commit 275b3e8)

Author: rusher

src/MySqlConnector/Core/CachedProcedure.cs

@@ -11,7 +11,9 @@ internal sealed class CachedProcedure
 	public static async Task<CachedProcedure?> FillAsync(IOBehavior ioBehavior, MySqlConnection connection, string schema, string component, CancellationToken cancellationToken)
 	{
 		// try to use mysql.proc first, as it is much faster
-		if (connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable && !connection.Session.ProcAccessDenied)
+		if (!connection.Session.ServerVersion.MariaDb
+		    && connection.Session.ServerVersion.Version < ServerVersions.RemovesMySqlProcTable
+		    && !connection.Session.ProcAccessDenied)
 		{
 			try
 			{
@@ -127,7 +129,7 @@ internal MySqlParameterCollection AlignParamsWithDb(MySqlParameterCollection? pa
 			if (!alignParam.HasSetDbType)
 				alignParam.MySqlDbType = cachedParam.MySqlDbType;
 
-			// cached parameters are oredered by ordinal position
+			// cached parameters are ordered by ordinal position
 			alignedParams.Add(alignParam);
 		}
 

src/MySqlConnector/Core/ServerSession.cs

@@ -613,7 +613,9 @@ public async Task<bool> TryResetConnectionAsync(ConnectionSettings cs, MySqlConn
 			ClearPreparedStatements();
 
 			PayloadData payload;
-			if (DatabaseOverride is null && (ServerVersion.Version.CompareTo(ServerVersions.SupportsResetConnection) >= 0 || ServerVersion.MariaDbVersion?.CompareTo(ServerVersions.MariaDbSupportsResetConnection) >= 0))
+			if (DatabaseOverride is null
+			    && ((!ServerVersion.MariaDb && ServerVersion.Version.CompareTo(ServerVersions.SupportsResetConnection) >= 0)
+			    || (ServerVersion.MariaDb && ServerVersion.Version.CompareTo(ServerVersions.MariaDbSupportsResetConnection) >= 0)))
 			{
 				m_logArguments[1] = ServerVersion.OriginalString;
 

src/MySqlConnector/Core/ServerVersion.cs

@@ -9,6 +9,16 @@ internal sealed class ServerVersion
 	public ServerVersion(ReadOnlySpan<byte> versionString)
 	{
 		OriginalString = Encoding.ASCII.GetString(versionString);
+		if (versionString.IndexOf("5.5.5-"u8) == 0)
+		{
+			// for MariaDB < 11.0.1
+			versionString = versionString[6..];
+			MariaDb = true;
+		}
+		else if (versionString.IndexOf("MariaDB"u8) != -1)
+		{
+			MariaDb = true;
+		}
 
 		var minor = 0;
 		var build = 0;
@@ -34,39 +44,11 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
 		}
 
 		Version = new Version(major, minor, build);
-
-		// check for MariaDB version appended to a fake MySQL version
-		if (versionString is [ 0x2D, .. ])
-		{
-			versionString = versionString[1..];
-			ReadOnlySpan<byte> mariaDb = "-MariaDB"u8;
-			var mariaDbIndex = versionString.IndexOf(mariaDb);
-			if (mariaDbIndex != -1)
-			{
-				var totalBytesRead = 0;
-				if (Utf8Parser.TryParse(versionString, out major, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
-				{
-					versionString = versionString[(bytesConsumed + 1)..];
-					totalBytesRead += bytesConsumed + 1;
-					if (Utf8Parser.TryParse(versionString, out minor, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
-					{
-						versionString = versionString[(bytesConsumed + 1)..];
-						totalBytesRead += bytesConsumed + 1;
-						if (Utf8Parser.TryParse(versionString, out build, out bytesConsumed) && versionString[bytesConsumed] == 0x2D)
-						{
-							totalBytesRead += bytesConsumed;
-							if (totalBytesRead == mariaDbIndex)
-								MariaDbVersion = new(major, minor, build);
-						}
-					}
-				}
-			}
-		}
 	}
 
+	public bool MariaDb { get; }
 	public string OriginalString { get; }
 	public Version Version { get; }
-	public Version? MariaDbVersion { get; }
 
 	public static ServerVersion Empty { get; } = new();
 

tests/MySqlConnector.Tests/ServerVersionTests.cs

@@ -8,41 +8,32 @@ namespace MySqlConnector.Tests;
 public class ServerVersionTests
 {
 	[Theory]
-	[InlineData("5.5.5-10.1.38-MariaDB-1~bionic", "5.5.5", "10.1.38")]
-	[InlineData("5.5.5-10-MariaDB", "5.5.5", null)]
-	[InlineData("5.5.5-10.2-MariaDB", "5.5.5", null)]
-	[InlineData("5.5.5-10.2.13-MariaDB", "5.5.5", "10.2.13")]
-	[InlineData("5.5.5-10.2.19-MariaDB-1:10.2.19+maria~bionic", "5.5.5", "10.2.19")]
-	[InlineData("5.5.5-10.3.13-MariaDB-1:10.3.13+maria~bionic", "5.5.5", "10.3.13")]
-	[InlineData("5.7.21-log", "5.7.21", null)]
-	[InlineData("8.0.13", "8.0.13", null)]
-	[InlineData("5.7.25-28", "5.7.25", null)]
-	[InlineData("5.7.25-", "5.7.25", null)]
-	[InlineData("5.7.25-10.2.3", "5.7.25", null)]
-	[InlineData("5.7.25-MariaDB-10.2.3", "5.7.25", null)]
-	[InlineData("5.7.25-10.2.3-10.3.19-MariaDB-1", "5.7.25", null)]
-	[InlineData("a.b.c", "0.0.0", null)]
-	[InlineData("1", "1.0.0", null)]
-	[InlineData("1.", "1.0.0", null)]
-	[InlineData("1.2", "1.2.0", null)]
-	[InlineData("1.2.", "1.2.0", null)]
-	[InlineData("1.2.3", "1.2.3", null)]
-	[InlineData("1.2.3.", "1.2.3", null)]
-	[InlineData("1.2.3-", "1.2.3", null)]
-	public void ParseServerVersion(string input, string expectedString, string expectedMariaDbString)
+	[InlineData("5.5.5-10.1.38-MariaDB-1~bionic", "10.1.38", true)]
+	[InlineData("5.5.5-10.2.13-MariaDB", "10.2.13", true)]
+	[InlineData("5.5.5-10.2.19-MariaDB-1:10.2.19+maria~bionic", "10.2.19", true)]
+	[InlineData("5.5.5-10.3.13-MariaDB-1:10.3.13+maria~bionic", "10.3.13", true)]
+	[InlineData("11.0.1-MariaDB-1:11.0.1+maria~bionic", "11.0.1", true)]
+	[InlineData("10.3.13-MariaDB-1:10.3.13+maria~bionic", "10.3.13", true)]
+	[InlineData("5.7.21-log", "5.7.21", false)]
+	[InlineData("8.0.13", "8.0.13", false)]
+	[InlineData("5.7.25-28", "5.7.25", false)]
+	[InlineData("5.7.25-", "5.7.25", false)]
+	[InlineData("5.7.25-10.2.3", "5.7.25", false)]
+	[InlineData("5.7.25-MariaDB-10.2.3", "5.7.25", true)]
+	[InlineData("5.7.25-10.2.3-10.3.19-MariaDB-1", "5.7.25", true)]
+	[InlineData("a.b.c", "0.0.0", false)]
+	[InlineData("1", "1.0.0", false)]
+	[InlineData("1.", "1.0.0", false)]
+	[InlineData("1.2", "1.2.0", false)]
+	[InlineData("1.2.", "1.2.0", false)]
+	[InlineData("1.2.3", "1.2.3", false)]
+	[InlineData("1.2.3.", "1.2.3", false)]
+	[InlineData("1.2.3-", "1.2.3", false)]
+	public void ParseServerVersion(string input, string expectedString, bool expectedMariaDb)
 	{
 		var serverVersion = new ServerVersion(Encoding.UTF8.GetBytes(input));
 		var expected = Version.Parse(expectedString);
 		Assert.Equal(expected, serverVersion.Version);
-
-		if (expectedMariaDbString is null)
-		{
-			Assert.Equal(default(Version), serverVersion.MariaDbVersion);
-		}
-		else
-		{
-			var expectedMariaDb = Version.Parse(expectedMariaDbString);
-			Assert.Equal(expectedMariaDb, serverVersion.MariaDbVersion);
-		}
+		Assert.Equal(expectedMariaDb, serverVersion.MariaDb);
 	}
 }