Merge pull request #36 from shaunsales/feature/aggregation

Implemented new aggregation type.

Author: DvirDukhan

NRedisTimeSeries.Example/MRangeExample.cs

@@ -17,7 +17,7 @@ internal class MRangeExample
         /// In this case, the strings are implicitly casted into TimeStamp objects.
         /// The TimeSeriesMRange command returns an IReadOnlyList<(string key, IReadOnlyList<TimeSeriesLabel> labels, IReadOnlyList<TimeSeriesTuple> values)>collection.
         /// </summary>
-        public static void  BasicMRangeExample()
+        public static void BasicMRangeExample()
         {
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
@@ -43,7 +43,7 @@ public static void CountMRangeExample()
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
             var filter = new List<string> { "MRANGEkey=MRANGEvalue" };
-            var results = db.TimeSeriesMRange("-", "+", filter, count:50);
+            var results = db.TimeSeriesMRange("-", "+", filter, count: 50);
             // Values extraction example. No lables in this case.
             foreach (var result in results)
             {
@@ -64,7 +64,7 @@ public static void MRangeAggregationExample()
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
             var filter = new List<string> { "MRANGEkey=MRANGEvalue" };
-            var results = db.TimeSeriesMRange("-", "+", filter, aggregation:Aggregation.MIN, timeBucket:50);
+            var results = db.TimeSeriesMRange("-", "+", filter, aggregation: TsAggregation.Min, timeBucket: 50);
             // Values extraction example. No lables in this case.
             foreach (var result in results)
             {
@@ -85,7 +85,7 @@ public static void MRangeWithLabelsExample()
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
             var filter = new List<string> { "MRANGEkey=MRANGEvalue" };
-            var results = db.TimeSeriesMRange("-", "+", filter,withLabels:true);
+            var results = db.TimeSeriesMRange("-", "+", filter, withLabels: true);
             // Values extraction example.
             foreach (var result in results)
             {

NRedisTimeSeries.Example/MRangeExampleAsync.cs

@@ -64,7 +64,7 @@ public static async Task MRangeAggregationAsyncExample()
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
             var filter = new List<string> { "MRANGEkey=MRANGEvalue" };
-            var results = await db.TimeSeriesMRangeAsync("-", "+", filter, aggregation: Aggregation.MIN, timeBucket: 50);
+            var results = await db.TimeSeriesMRangeAsync("-", "+", filter, aggregation: TsAggregation.Min, timeBucket: 50);
             // Values extraction example. No lables in this case.
             foreach (var result in results)
             {

NRedisTimeSeries.Example/RangeExample.cs

@@ -49,7 +49,7 @@ public static void RangeAggregationExample()
         {
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
-            db.TimeSeriesRange("my_ts", "-", "+", aggregation: Aggregation.MIN, timeBucket: 50);
+            db.TimeSeriesRange("my_ts", "-", "+", aggregation: TsAggregation.Min, timeBucket: 50);
             redis.Close();
         }
     }

NRedisTimeSeries.Example/RangeExampleAsync.cs

@@ -49,7 +49,7 @@ public static async Task RangeAggregationAsyncExample()
         {
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
-            await db.TimeSeriesRangeAsync("my_ts", "-", "+", aggregation: Aggregation.MIN, timeBucket: 50);
+            await db.TimeSeriesRangeAsync("my_ts", "-", "+", aggregation: TsAggregation.Min, timeBucket: 50);
             redis.Close();
         }
     }

NRedisTimeSeries.Example/RulesExample.cs

@@ -18,7 +18,7 @@ public static void  RulesCreateDeleteExample()
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
             // Create you rule with destination key, time bucket and aggregation type.
-            TimeSeriesRule rule = new TimeSeriesRule("dest_ts", 50, Aggregation.AVG);
+            TimeSeriesRule rule = new TimeSeriesRule("dest_ts", 50, TsAggregation.Avg);
             db.TimeSeriesCreateRule("my_ts", rule);
             db.TimeSeriesDeleteRule("my_ts", "dest");
             redis.Close();

NRedisTimeSeries.Example/RulesExampleAsync.cs

@@ -18,7 +18,7 @@ public static async Task RulesCreateDeleteAsyncExample()
             ConnectionMultiplexer redis = ConnectionMultiplexer.Connect("localhost");
             IDatabase db = redis.GetDatabase();
             // Create your rule with destination key, time bucket and aggregation type.
-            TimeSeriesRule rule = new TimeSeriesRule("dest_ts", 50, Aggregation.AVG);
+            TimeSeriesRule rule = new TimeSeriesRule("dest_ts", 50, TsAggregation.Avg);
             await db.TimeSeriesCreateRuleAsync("my_ts", rule);
             await db.TimeSeriesDeleteRuleAsync("my_ts", "dest");
             redis.Close();

NRedisTimeSeries.Test/TestAPI/TestMRange.cs

@@ -133,7 +133,7 @@ public void TestMRangeAggregation()
             }
 
             var tuples = CreateData(db, 50);
-            var results = db.TimeSeriesMRange("-", "+", new List<string> { "key=MRangeAggregation" }, aggregation: Aggregation.MIN, timeBucket: 50);
+            var results = db.TimeSeriesMRange("-", "+", new List<string> { "key=MRangeAggregation" }, aggregation: TsAggregation.Min, timeBucket: 50);
             Assert.Equal(keys.Length, results.Count);
             for (int i = 0; i < results.Count; i++)
             {
@@ -171,7 +171,7 @@ public void TestMissingTimeBucket()
             }
 
             var tuples = CreateData(db, 50);
-            var ex = Assert.Throws<ArgumentException>(() => db.TimeSeriesMRange("-", "+", new List<string> { "key=MissingTimeBucket" }, aggregation: Aggregation.AVG));
+            var ex = Assert.Throws<ArgumentException>(() => db.TimeSeriesMRange("-", "+", new List<string> { "key=MissingTimeBucket" }, aggregation: TsAggregation.Avg));
             Assert.Equal("RANGE Aggregation should have timeBucket value", ex.Message);
 
         }

NRedisTimeSeries.Test/TestAPI/TestMRangeAsync.cs

@@ -128,7 +128,7 @@ public async Task TestMRangeAggregation()
             }
 
             var tuples = await CreateData(db, keys, 50);
-            var results = await db.TimeSeriesMRangeAsync("-", "+", new List<string> { $"{keys[0]}=value" }, aggregation: Aggregation.MIN, timeBucket: 50);
+            var results = await db.TimeSeriesMRangeAsync("-", "+", new List<string> { $"{keys[0]}=value" }, aggregation: TsAggregation.Min, timeBucket: 50);
             Assert.Equal(keys.Length, results.Count);
             for (var i = 0; i < results.Count; i++)
             {
@@ -172,7 +172,7 @@ public async Task TestMissingTimeBucket()
             {
                 await db.TimeSeriesMRangeAsync("-", "+",
                     filter: new List<string>() { $"key=value" },
-                    aggregation: Aggregation.AVG);
+                    aggregation: TsAggregation.Avg);
             });
             Assert.Equal("RANGE Aggregation should have timeBucket value", ex.Message);
         }

NRedisTimeSeries.Test/TestAPI/TestMRevRange.cs

@@ -128,7 +128,7 @@ public void TestMRevRangeAggregation()
             }
 
             var tuples = CreateData(db, keys, 50);
-            var results = db.TimeSeriesMRevRange("-", "+", new List<string> { $"{keys[0]}=value" }, aggregation: Aggregation.MIN, timeBucket: 50);
+            var results = db.TimeSeriesMRevRange("-", "+", new List<string> { $"{keys[0]}=value" }, aggregation: TsAggregation.Min, timeBucket: 50);
             Assert.Equal(keys.Length, results.Count);
             for (var i = 0; i < results.Count; i++)
             {
@@ -168,7 +168,7 @@ public void TestMissingTimeBucket()
             }
 
             var tuples = CreateData(db, keys, 50);
-            var ex = Assert.Throws<ArgumentException>(() => db.TimeSeriesMRevRange("-", "+", new List<string> { "key=MissingTimeBucket" }, aggregation: Aggregation.AVG));
+            var ex = Assert.Throws<ArgumentException>(() => db.TimeSeriesMRevRange("-", "+", new List<string> { "key=MissingTimeBucket" }, aggregation: TsAggregation.Avg));
             Assert.Equal("RANGE Aggregation should have timeBucket value", ex.Message);
 
         }

NRedisTimeSeries.Test/TestAPI/TestMRevRangeAsync.cs

@@ -128,7 +128,7 @@ public async Task TestMRangeAggregation()
             }
 
             var tuples = await CreateData(db, keys, 50);
-            var results = await db.TimeSeriesMRevRangeAsync("-", "+", new List<string> { $"{keys[0]}=value" }, aggregation: Aggregation.MIN, timeBucket: 50);
+            var results = await db.TimeSeriesMRevRangeAsync("-", "+", new List<string> { $"{keys[0]}=value" }, aggregation: TsAggregation.Min, timeBucket: 50);
             Assert.Equal(keys.Length, results.Count);
             for (var i = 0; i < results.Count; i++)
             {
@@ -172,7 +172,7 @@ public async Task TestMissingTimeBucket()
             {
                 await db.TimeSeriesMRevRangeAsync("-", "+",
                     filter: new List<string>() { $"key=value" },
-                    aggregation: Aggregation.AVG);
+                    aggregation: TsAggregation.Avg);
             });
             Assert.Equal("RANGE Aggregation should have timeBucket value", ex.Message);
         }