- add SVS integration tests

- fix LeanVec command typo

Author: mgravell

src/NRedisStack/Search/Schema.cs

@@ -556,8 +556,8 @@ internal override void AddDirectAttributes(List<object> args)
                         VectorCompressionAlgorithm.LVQ4 => "LVQ4",
                         VectorCompressionAlgorithm.LVQ4x4 => "LVQ4x4",
                         VectorCompressionAlgorithm.LVQ4x8 => "LVQ4x8",
-                        VectorCompressionAlgorithm.LeanVec4x8 => "LEAN_VEC4x8",
-                        VectorCompressionAlgorithm.LeanVec8x8 => "LEAN_VEC8x8",
+                        VectorCompressionAlgorithm.LeanVec4x8 => "LeanVec4x8",
+                        VectorCompressionAlgorithm.LeanVec8x8 => "LeanVec8x8",
                         _ => CompressionAlgorithm.ToString(), // fallback
                     });
                 }

tests/NRedisStack.Tests/AbstractNRedisStackTest.cs

@@ -3,11 +3,16 @@
 using System.Runtime.CompilerServices;
 using StackExchange.Redis;
 using Xunit;
+using Xunit.Abstractions;
+
 namespace NRedisStack.Tests;
 
 public abstract class AbstractNRedisStackTest : IClassFixture<EndpointsFixture>, IAsyncLifetime
 {
     protected internal EndpointsFixture EndpointsFixture;
+    private readonly ITestOutputHelper? log;
+
+    protected void Log(string message) => log?.WriteLine(message); // TODO: DISH overload in net9? net10?
 
     protected readonly ConfigurationOptions DefaultConnectionConfig = new()
     {
@@ -16,9 +21,10 @@ public abstract class AbstractNRedisStackTest : IClassFixture<EndpointsFixture>,
         AllowAdmin = true,
     };
 
-    protected internal AbstractNRedisStackTest(EndpointsFixture endpointsFixture)
+    protected internal AbstractNRedisStackTest(EndpointsFixture endpointsFixture, ITestOutputHelper? log = null)
     {
         this.EndpointsFixture = endpointsFixture;
+        this.log = log;
     }
 
     protected ConnectionMultiplexer GetConnection(string endpointId = EndpointsFixture.Env.Standalone) => EndpointsFixture.GetConnectionById(this.DefaultConnectionConfig, endpointId);

tests/NRedisStack.Tests/Search/IndexCreationTests.cs

@@ -1,19 +1,22 @@
+using System.Runtime.InteropServices;
 using StackExchange.Redis;
 using NRedisStack.Search;
 using NRedisStack.RedisStackCommands;
 using Xunit;
 using NetTopologySuite.Geometries;
+using Xunit.Abstractions;
 
 namespace NRedisStack.Tests.Search;
 
 public class IndexCreationTests : AbstractNRedisStackTest, IDisposable
 {
     private readonly string index = "MISSING_EMPTY_INDEX";
 
-    public IndexCreationTests(EndpointsFixture endpointsFixture) : base(endpointsFixture)
+    public IndexCreationTests(EndpointsFixture endpointsFixture, ITestOutputHelper log) : base(endpointsFixture, log)
     {
     }
 
+    private readonly ITestOutputHelper log;
     private static readonly string INDEXMISSING = "INDEXMISSING";
     private static readonly string INDEXEMPTY = "INDEXEMPTY";
     private static readonly string SORTABLE = "SORTABLE";
@@ -144,6 +147,7 @@ public void TestCreateFloat16VectorField(string endpointId)
             ["DIM"] = "4",
             ["DISTANCE_METRIC"] = "L2",
         });
+
         Assert.True(ft.Create("idx", new FTCreateParams(), schema));
 
         short[] vec1 = new short[] { 2, 1, 2, 2, 2 };
@@ -168,6 +172,74 @@ public void TestCreateFloat16VectorField(string endpointId)
         Assert.Equal(2, res.TotalResults);
     }
 
+    [SkipIfRedis(Comparison.LessThan, "8.1.240")]
+    [MemberData(nameof(EndpointsFixture.Env.StandaloneOnly), MemberType = typeof(EndpointsFixture.Env))]
+    public void TestCreate_Float16_Int32_VectorField_Svs(string endpointId)
+    {
+        IDatabase db = GetCleanDatabase(endpointId);
+        var ft = db.FT(2);
+        var schema = new Schema().AddSvsVanamaVectorField("v", Schema.VectorField.VectorType.FLOAT16, 5,
+                Schema.VectorField.VectorDistanceMetric.EuclideanDistance)
+            .AddSvsVanamaVectorField("v2", Schema.VectorField.VectorType.FLOAT32, 4,
+                Schema.VectorField.VectorDistanceMetric.EuclideanDistance);
+
+        var cmd = SearchCommandBuilder.Create("idx", FTCreateParams.CreateParams(), schema).ToString();
+        Log(cmd);
+
+        Assert.True(ft.Create("idx", new FTCreateParams(), schema));
+
+        byte[] vec1ToBytes = MemoryMarshal.AsBytes(stackalloc short[] { 2, 1, 2, 2, 2 }).ToArray();
+        byte[] vec2ToBytes = MemoryMarshal.AsBytes(stackalloc int[] { 1, 2, 2, 2 }).ToArray();
+
+        var entries = new HashEntry[] { new HashEntry("v", vec1ToBytes), new HashEntry("v2", vec2ToBytes) };
+        db.HashSet("a", entries);
+        db.HashSet("b", entries);
+        db.HashSet("c", entries);
+
+        var q = new Query("*=>[KNN 2 @v $vec]").ReturnFields("__v_score");
+        var res = ft.Search("idx", q.AddParam("vec", vec1ToBytes));
+        Assert.Equal(2, res.TotalResults);
+
+        q = new Query("*=>[KNN 2 @v2 $vec]").ReturnFields("__v_score");
+        res = ft.Search("idx", q.AddParam("vec", vec2ToBytes));
+        Assert.Equal(2, res.TotalResults);
+    }
+
+    [SkipIfRedis(Comparison.LessThan, "8.1.240")]
+    [MemberData(nameof(EndpointsFixture.Env.StandaloneOnly), MemberType = typeof(EndpointsFixture.Env))]
+    public void TestCreate_Float16_Int32_VectorField_Svs_WithCompression(string endpointId)
+    {
+        IDatabase db = GetCleanDatabase(endpointId);
+        var ft = db.FT(2);
+        var schema = new Schema().AddSvsVanamaVectorField("v", Schema.VectorField.VectorType.FLOAT16, 5,
+                Schema.VectorField.VectorDistanceMetric.EuclideanDistance,
+                reducedDimensions: 2, compressionAlgorithm: Schema.VectorField.VectorCompressionAlgorithm.LeanVec4x8)
+            .AddSvsVanamaVectorField("v2", Schema.VectorField.VectorType.FLOAT32, 4,
+                Schema.VectorField.VectorDistanceMetric.EuclideanDistance,
+                compressionAlgorithm: Schema.VectorField.VectorCompressionAlgorithm.LVQ4);
+
+        var cmd = SearchCommandBuilder.Create("idx", FTCreateParams.CreateParams(), schema).ToString();
+        Log(cmd);
+
+        Assert.True(ft.Create("idx", new FTCreateParams(), schema));
+
+        byte[] vec1ToBytes = MemoryMarshal.AsBytes(stackalloc short[] { 2, 1, 2, 2, 2 }).ToArray();
+        byte[] vec2ToBytes = MemoryMarshal.AsBytes(stackalloc int[] { 1, 2, 2, 2 }).ToArray();
+
+        var entries = new HashEntry[] { new HashEntry("v", vec1ToBytes), new HashEntry("v2", vec2ToBytes) };
+        db.HashSet("a", entries);
+        db.HashSet("b", entries);
+        db.HashSet("c", entries);
+
+        var q = new Query("*=>[KNN 2 @v $vec]").ReturnFields("__v_score");
+        var res = ft.Search("idx", q.AddParam("vec", vec1ToBytes));
+        Assert.Equal(2, res.TotalResults);
+
+        q = new Query("*=>[KNN 2 @v2 $vec]").ReturnFields("__v_score");
+        res = ft.Search("idx", q.AddParam("vec", vec2ToBytes));
+        Assert.Equal(2, res.TotalResults);
+    }
+
     [SkipIfRedis(Comparison.LessThan, "7.9.0")]
     [MemberData(nameof(EndpointsFixture.Env.StandaloneOnly), MemberType = typeof(EndpointsFixture.Env))]
     public void TestCreateInt8VectorField(string endpointId)
@@ -203,7 +275,7 @@ public void TestCreateInt8VectorField(string endpointId)
         res = ft.Search("idx", q.AddParam("vec", vec2));
         Assert.Equal(2, res.TotalResults);
     }
-
+    
     [Fact]
     public void TestMissingSortableFieldCommandArgs()
     {