Support VECTOR for MariaDB 11.7.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

azure-pipelines.yml

@@ -192,10 +192,10 @@ jobs:
         image: 'mariadb:11.4'
         connectionStringExtra: ''
         unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Redirection,Sha256Password,Tls11,UuidToBin,Vector'
-      'MariaDB 11.6':
-        image: 'mariadb:11.6'
+      'MariaDB 11.7':
+        image: 'mariadb:11.7'
         connectionStringExtra: ''
-        unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Redirection,Sha256Password,Tls11,UuidToBin,Vector'
+        unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Redirection,Sha256Password,Tls11,UuidToBin,VectorType'
   steps:
   - template: '.ci/integration-tests-steps.yml'
     parameters:

src/MySqlConnector/Core/SingleCommandPayloadCreator.cs

@@ -165,6 +165,10 @@ private static void WriteBinaryParameters(ByteBufferWriter writer, MySqlParamete
 				mySqlDbType = TypeMapper.Instance.GetMySqlDbTypeForDbType(dbType);
 			}
 
+			// HACK: MariaDB doesn't have a dedicated Vector type so mark it as binary data
+			if (mySqlDbType == MySqlDbType.Vector && command.Connection!.Session.ServerVersion.IsMariaDb)
+				mySqlDbType = MySqlDbType.LongBlob;
+
 			writer.Write(TypeMapper.ConvertToColumnTypeAndFlags(mySqlDbType, command.Connection!.GuidFormat));
 
 			if (supportsQueryAttributes)

tests/IntegrationTests/CharacterSetTests.cs

@@ -79,7 +79,7 @@ public void CollationConnection(bool reopenConnection)
 
 		var collation = connection.Query<string>(@"select @@collation_connection;").Single();
 		var expected = connection.ServerVersion.Substring(0, 2) is "8." or "9." ? "utf8mb4_0900_ai_ci" :
-			connection.ServerVersion.StartsWith("11.4.", StringComparison.Ordinal) || connection.ServerVersion.StartsWith("11.6.", StringComparison.Ordinal) ? "utf8mb4_uca1400_ai_ci" :
+			connection.ServerVersion.StartsWith("11.4.", StringComparison.Ordinal) || connection.ServerVersion.StartsWith("11.7.", StringComparison.Ordinal) ? "utf8mb4_uca1400_ai_ci" :
 			"utf8mb4_general_ci";
 		Assert.Equal(expected, collation);
 	}

tests/IntegrationTests/DataTypes.cs

@@ -1205,6 +1205,15 @@ private void DoGetSchemaTable(string column, string table, MySqlDbType mySqlDbTy
 		if (table == "datatypes_vector" && !AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Vector))
 			return;
 
+		// adjust for databases that don't have a dedicated on-the-wire type for VECTOR(n)
+		if (mySqlDbType == MySqlDbType.Vector && !AppConfig.SupportedFeatures.HasFlag(ServerFeatures.VectorType))
+		{
+			mySqlDbType = MySqlDbType.VarBinary;
+			columnSize *= 4;
+			dataType = typeof(byte[]);
+			scale = 0;
+		}
+
 		var isAutoIncrement = flags.IndexOf('A') != -1;
 		var isKey = flags.IndexOf('K') != -1;
 		var isLong = flags.IndexOf('L') != -1;
@@ -1609,26 +1618,32 @@ public void QueryJson(string column, string[] expected)
 	}
 
 	[SkippableTheory(ServerFeatures.Vector)]
-	[InlineData("value", new[] { null, "0,0,0", "1,1,1", "1,2,3", "3.40282347E+38,3.40282347E+38,3.40282347E+38" })]
+	[InlineData("value", new[] { null, "0,0,0", "1,1,1", "1,2,3", "-1,-1,-1" })]
 	public void QueryVector(string column, string[] expected)
 	{
-		string dataTypeName = "VECTOR";
+		var hasVectorType = AppConfig.SupportedFeatures.HasFlag(ServerFeatures.VectorType);
+		string dataTypeName = hasVectorType ? "VECTOR" : "BLOB";
 		DoQuery("vector", column, dataTypeName,
 			expected.Select(x =>
-#if MYSQL_DATA
-				// Connector/NET returns the float array as a byte[]
-				x is null ? null : MemoryMarshal.AsBytes<float>(x.Split(',').Select(x => float.Parse(x, CultureInfo.InvariantCulture)).ToArray()).ToArray())
+#if !MYSQL_DATA
+				hasVectorType ? (object) GetFloatArray(x) : GetByteArray(x))
 #else
-				x?.Split(',').Select(x => float.Parse(x, CultureInfo.InvariantCulture)).ToArray())
+				// Connector/NET returns the float array as a byte[]
+				GetByteArray(x))
 #endif
 			.ToArray(),
 #if !MYSQL_DATA
-			static x => (float[]) x.GetValue(0),
+			x => hasVectorType ? (float[]) x.GetValue(0) : (byte[]) x.GetValue(0),
 #else
 			// NOTE: Connector/NET returns 'null' for NULL so simulate an exception for the tests
 			x => x.IsDBNull(0) ? throw new GetValueWhenNullException() : x.GetValue(0),
 #endif
 			omitWhereTest: true);
+
+		static float[] GetFloatArray(string value) => value?.Split(',').Select(x => float.Parse(x, CultureInfo.InvariantCulture)).ToArray();
+
+		static byte[] GetByteArray(string value) =>
+			GetFloatArray(value) is { } floats ? MemoryMarshal.AsBytes<float>(floats).ToArray() : null;
 	}
 
 	[SkippableTheory(MySqlData = "https://bugs.mysql.com/bug.php?id=97067")]

tests/IntegrationTests/DataTypesFixture.cs

@@ -245,6 +245,10 @@ insert into datatypes_json_core (value)
 
 		if (AppConfig.SupportedFeatures.HasFlag(ServerFeatures.Vector))
 		{
+			// create a helper function for MariaDB 11.7+
+			if (Connection.ServerVersion.StartsWith("11.7.", StringComparison.Ordinal))
+				Connection.Execute("create function if not exists STRING_TO_VECTOR(s text) returns vector(3) deterministic return Vec_FromText(s);");
+
 			Connection.Execute("""
 				drop table if exists datatypes_vector;
 				create table datatypes_vector (
@@ -257,7 +261,7 @@ insert into datatypes_vector (value)
 					(STRING_TO_VECTOR('[0, 0, 0]')),
 					(STRING_TO_VECTOR('[1, 1, 1]')),
 					(STRING_TO_VECTOR('[1, 2, 3]')),
-					(STRING_TO_VECTOR('[3.40282347E+38, 3.40282347E+38, 3.40282347E+38]'));
+					(STRING_TO_VECTOR('[-1, -1, -1]'));
 				""");
 		}
 		Connection.Close();

tests/IntegrationTests/QueryTests.cs

@@ -1700,7 +1700,7 @@ public void QueryVector(bool prepare)
 
 		connection.Execute("""
 			drop table if exists test_vector;
-			create table test_vector(id int auto_increment not null primary key, vec vector not null);
+			create table test_vector(id int auto_increment not null primary key, vec vector(3) not null);
 			""");
 
 		using var cmd = m_database.Connection.CreateCommand();
@@ -1735,7 +1735,8 @@ public void QueryVector(bool prepare)
 #if MYSQL_DATA
 		var result = MemoryMarshal.Cast<byte, float>((byte[]) value).ToArray();
 #else
-		var result = (float[]) value;
+		var result = AppConfig.SupportedFeatures.HasFlag(ServerFeatures.VectorType) ? (float[]) value :
+			MemoryMarshal.Cast<byte, float>((byte[]) value).ToArray();
 #endif
 		Assert.Equal(floatArray, result);
 	}

tests/IntegrationTests/ServerFeatures.cs

@@ -47,7 +47,12 @@ public enum ServerFeatures
 	TlsFingerprintValidation = 0x100_0000,
 
 	/// <summary>
-	/// Server supports the <c>VECTOR</c> data type.
+	/// Server supports the <c>VECTOR</c> SQL type.
 	/// </summary>
 	Vector = 0x200_0000,
+
+	/// <summary>
+	/// Server has a dedicated type on the wire for <c>VECTOR</c>.
+	/// </summary>
+	VectorType = 0x400_0000,
 }