Tdigest/commands (#11)

* Start addin Tdigest commands

* Add Tdigest Commands & Fixing Parsing Warnings

* Fixing test failures

Author: shacharPash

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

src/NRedisStack.Core/CountMinSketch/CmsCommands.cs

@@ -234,7 +234,6 @@ public long[] Query(RedisKey key, params RedisValue[] items)
 
             List<object> args = new List<object> { key };
             foreach (var item in items) args.Add(item);
-            foreach (var item in items) args.Add(item);
 
             return ResponseParser.ToLongArray(_db.Execute(CMS.QUERY, args));
         }
@@ -253,7 +252,6 @@ public async Task<long[]> QueryAsync(RedisKey key, params RedisValue[] items)
 
             List<object> args = new List<object> { key };
             foreach (var item in items) args.Add(item);
-            foreach (var item in items) args.Add(item);
 
             var result = await _db.ExecuteAsync(CMS.QUERY, args);
             return ResponseParser.ToLongArray(result);

src/NRedisStack.Core/ModulPrefixes.cs

@@ -16,6 +16,9 @@ public static class ModulPrefixes
         static bool topKCreated = false;
         static TopKCommands topKCommands;
 
+        static bool tdigestCreated = false;
+        static TdigestCommands tdigestCommands;
+
         static bool searchCreated = false;
         static SearchCommands searchCommands;
 
@@ -69,6 +72,17 @@ static public TopKCommands TOPK(this IDatabase db)
             return topKCommands;
         }
 
+        static public TdigestCommands TDIGEST(this IDatabase db)
+        {
+            if (!tdigestCreated)
+            {
+                tdigestCommands = new TdigestCommands(db);
+                tdigestCreated = true;
+            }
+
+            return tdigestCommands;
+        }
+
         static public SearchCommands FT(this IDatabase db)
         {
             if (!searchCreated)

src/NRedisStack.Core/ResponseParser.cs

@@ -357,11 +357,11 @@ public static IReadOnlyList<TimeSeriesRule> ToRuleArray(RedisResult result)
         public static TdigestInformation ToTdigestInfo(RedisResult result) //TODO: Think about a different implementation, because if the output of CMS.INFO changes or even just the names of the labels then the parsing will not work
         {
             long compression, capacity, mergedNodes, unmergedNodes, totalCompressions;
-            string? mergedWeight, unmergedWeight;
+            double mergedWeight, unmergedWeight;
 
             compression = capacity = mergedNodes = unmergedNodes = totalCompressions = -1;
-            mergedWeight = unmergedWeight = "";
-
+            mergedWeight = unmergedWeight = -1.0;
+            
             RedisResult[] redisResults = ToArray(result);
 
             for (int i = 0; i < redisResults.Length; ++i)
@@ -383,10 +383,11 @@ public static IReadOnlyList<TimeSeriesRule> ToRuleArray(RedisResult result)
                         unmergedNodes = (long)redisResults[i];
                         break;
                     case "Merged weight":
-                        mergedWeight = redisResults[i].ToString();
+
+                        mergedWeight = (double)redisResults[i];
                         break;
                     case "Unmerged weight":
-                        unmergedWeight = redisResults[i].ToString();
+                        unmergedWeight = (double)redisResults[i];
                         break;
                     case "Total compressions":
                         totalCompressions = (long)redisResults[i];

src/NRedisStack.Core/Tdigest/DataTypes/TdigestInformation.cs

@@ -10,14 +10,16 @@ public class TdigestInformation
         public long Capacity { get; private set; }
         public long MergedNodes { get; private set; }
         public long UnmergedNodes { get; private set; }
-        public string MergedWeight { get; private set; }
-        public string UnmergedWeight { get; private set; }
+        public double MergedWeight { get; private set; }
+        public double UnmergedWeight { get; private set; }
+
         public long TotalCompressions { get; private set; }
 
 
         internal TdigestInformation(long compression, long capacity, long mergedNodes,
-                                    long unmergedNodes, string mergedWeight,
-                                    string unmergedWeight, long totalCompressions)
+                                    long unmergedNodes, double mergedWeight,
+                                    double unmergedWeight, long totalCompressions)
+
         {
             Compression = compression;
             Capacity = capacity;

tests/NRedisStack.Tests/CountMinSketch/CmsTests.cs

@@ -184,7 +184,7 @@ public void TestQuery()
 
         db.CMS().IncrBy(key, itemIncrements);
 
-        var resp = db.CMS().Query(key, new RedisValue[] { "foo", "bar" });
+        var resp = db.CMS().Query(key, "foo", "bar");
         Assert.Equal(new long[] { 10, 15 }, resp);
     }
 

tests/NRedisStack.Tests/NRedisStack.Tests.csproj

@@ -22,4 +22,10 @@
     <ProjectReference Include="..\..\src\NRedisStack.Core\NRedisStack.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

tests/NRedisStack.Tests/Tdigest/TdigestTests.cs

@@ -0,0 +1,40 @@
+using Xunit;
+using StackExchange.Redis;
+using NRedisStack.Core.RedisStackCommands;
+using Moq;
+
+namespace NRedisStack.Tests.Tdigest;
+
+public class TdigestTests : AbstractNRedisStackTest, IDisposable
+{
+    Mock<IDatabase> _mock = new Mock<IDatabase>();
+    private readonly string key = "TDIGEST_TESTS";
+    public TdigestTests(RedisFixture redisFixture) : base(redisFixture) { }
+
+    public void Dispose()
+    {
+        redisFixture.Redis.GetDatabase().KeyDelete(key);
+    }
+
+//     private void AssertMergedUnmergedNodes( IDatabase db, string key, int mergedNodes, int unmergedNodes) {
+//     var info = db.TDIGEST().Info(key);
+//     Assert.Equal((long) mergedNodes, info.MergedNodes);
+//     Assert.Equal((long) unmergedNodes, info.UnmergedNodes);
+//   }
+
+//   private void assertTotalWeight(IDatabase db, string key, double totalWeight) {
+//     var info = db.TDIGEST().Info(key);
+//     Assert.Equal(totalWeight, info.MergedWeight Double.parseDouble((string) info.get("Merged weight"))
+//         + Double.parseDouble((string) info.get("Unmerged weight")), 0.01);
+//   }
+
+//     [Fact]
+//     public void AssertMergedUnmergedNodes()
+//     {
+//         IDatabase db = redisFixture.Redis.GetDatabase();
+//         db.Execute("FLUSHALL");
+
+//         var info = db.TDIGEST().Info()
+
+//     }
+}

tests/NRedisStack.Tests/TimeSeries/TimeSeriesTests.cs

@@ -21,7 +21,8 @@ public void Dispose()
     public void TestCreateOK()
     {
         IDatabase db = redisFixture.Redis.GetDatabase();
-        Assert.True(db.TS().Create(key));
+        var result = db.TS().Create(key);
+        Assert.True(result);
         //TimeSeriesInformation info = db.TS().Info(key);
     }
 

tests/NRedisStack.Tests/xunit.runner.json

@@ -0,0 +1,4 @@
+{
+    "parallelizeAssembly": false,
+    "parallelizeTestCollections": false
+}