From bc7c75ab385602de46a8c75903a68b33f8d05f69 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Thu, 4 May 2023 17:47:13 +0300 Subject: [PATCH 1/4] Change TimeStamp from DateTime to Millisecond Instead of Ticks --- src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs | 2 +- tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs | 4 ++-- tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs | 4 ++-- .../TimeSeries/TestDataTypes/TestTimeStamp.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs index d33a848d..0505db90 100644 --- a/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs +++ b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs @@ -23,7 +23,7 @@ public class TimeStamp /// Build a TimeStamp from DateTime. /// /// DateTime value - public TimeStamp(DateTime dateTime) => Value = dateTime.Ticks; + public TimeStamp(DateTime dateTime) => Value = (long) dateTime.Millisecond; // TODO: Check this /// /// Build a TimeStamp from one of the strings "-", "+", "*". diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs index 5aa329bd..f6a744a2 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs @@ -76,7 +76,7 @@ public void TestSuccessfulMADD() Assert.Equal(timestamps.Count, response.Count); for (int i = 0; i < response.Count; i++) { - Assert.Equal(timestamps[i], response[i]); + Assert.Equal(timestamps[i].Millisecond, response[i]); } } @@ -117,7 +117,7 @@ public void TestOverrideMADD() Assert.Equal(oldTimeStamps.Count, response.Count); for (int i = 0; i < response.Count; i++) { - Assert.Equal(oldTimeStamps[i], response[i]); + Assert.Equal(oldTimeStamps[i].Millisecond, response[i]); } } } diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs index 7778accf..1d23277d 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs @@ -69,7 +69,7 @@ public async Task TestSuccessfulMAdd() Assert.Equal(timestamps.Count, response.Count); for (var i = 0; i < response.Count; i++) { - Assert.Equal(timestamps[i], response[i]); + Assert.Equal(timestamps[i].Millisecond, response[i]); } } @@ -112,7 +112,7 @@ public async Task TestOverrideMAdd() Assert.Equal(oldTimeStamps.Count, response.Count); for (int i = 0; i < response.Count; i++) { - Assert.Equal(oldTimeStamps[i], response[i]); + Assert.Equal(oldTimeStamps[i].Millisecond, response[i]); } } } diff --git a/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs b/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs index 40212109..25dd2d05 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs @@ -25,7 +25,7 @@ public void TestTimeStampImplicitCast() DateTime now = DateTime.UtcNow; ts = now; - Assert.Equal(now, ts); + Assert.Equal(now.Millisecond, ts); } } From 67ced355c6f2e9d10303aa454b47716e987bc385 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Thu, 4 May 2023 18:01:55 +0300 Subject: [PATCH 2/4] Assert.Equal the Values --- tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs | 3 ++- tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs index 21a6b3d4..31c6450a 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAdd.cs @@ -210,7 +210,8 @@ public void TestOldAdd() ts.Create(key); ts.Add(key, new_dt, 1.1); // Adding old event - Assert.Equal(old_dt, ts.Add(key, old_dt, 1.1)); + var res = ts.Add(key, old_dt, 1.1); + Assert.Equal(old_dt.Value, res.Value); } [Fact] diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs index fd70c700..c7ec525d 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestAddAsync.cs @@ -228,7 +228,8 @@ public async Task TestOldAdd() await ts.CreateAsync(key); await ts.AddAsync(key, newTimeStamp, 1.1); // Adding old event - Assert.Equal(oldTimeStamp, await ts.AddAsync(key, oldTimeStamp, 1.1)); + var res = await ts.AddAsync(key, oldTimeStamp, 1.1); + Assert.Equal(oldTimeStamp.Value, res.Value); } [Fact] From 9140f7c2f5df93bc2b307f5ce88dd9e0504fc0cc Mon Sep 17 00:00:00 2001 From: shacharPash <93581407+shacharPash@users.noreply.github.com> Date: Fri, 5 May 2023 02:37:35 +0300 Subject: [PATCH 3/4] Update src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs Co-authored-by: Steve Lorello <42971704+slorello89@users.noreply.github.com> --- src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs index 0505db90..1dfe3e76 100644 --- a/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs +++ b/src/NRedisStack/TimeSeries/DataTypes/TimeStamp.cs @@ -23,7 +23,7 @@ public class TimeStamp /// Build a TimeStamp from DateTime. /// /// DateTime value - public TimeStamp(DateTime dateTime) => Value = (long) dateTime.Millisecond; // TODO: Check this + public TimeStamp(DateTime dateTime) => Value = new DateTimeOffset(dateTime).ToUnixTimeMilliseconds(); /// /// Build a TimeStamp from one of the strings "-", "+", "*". From 832c15faf2147a45fdc7508fd56a8ca868b90e73 Mon Sep 17 00:00:00 2001 From: shacharPash Date: Sun, 7 May 2023 16:45:36 +0300 Subject: [PATCH 4/4] update tests --- tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs | 4 ++-- tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs | 4 ++-- .../TimeSeries/TestDataTypes/TestTimeStamp.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs index f6a744a2..e2a22064 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMADD.cs @@ -76,7 +76,7 @@ public void TestSuccessfulMADD() Assert.Equal(timestamps.Count, response.Count); for (int i = 0; i < response.Count; i++) { - Assert.Equal(timestamps[i].Millisecond, response[i]); + Assert.Equal(new DateTimeOffset(timestamps[i]).ToUnixTimeMilliseconds(), response[i].Value); } } @@ -117,7 +117,7 @@ public void TestOverrideMADD() Assert.Equal(oldTimeStamps.Count, response.Count); for (int i = 0; i < response.Count; i++) { - Assert.Equal(oldTimeStamps[i].Millisecond, response[i]); + Assert.Equal(new DateTimeOffset(oldTimeStamps[i]).ToUnixTimeMilliseconds(), response[i].Value); } } } diff --git a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs index 1d23277d..5d5ce9c5 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestAPI/TestMAddAsync.cs @@ -69,7 +69,7 @@ public async Task TestSuccessfulMAdd() Assert.Equal(timestamps.Count, response.Count); for (var i = 0; i < response.Count; i++) { - Assert.Equal(timestamps[i].Millisecond, response[i]); + Assert.Equal(new DateTimeOffset(timestamps[i]).ToUnixTimeMilliseconds(), response[i].Value); } } @@ -112,7 +112,7 @@ public async Task TestOverrideMAdd() Assert.Equal(oldTimeStamps.Count, response.Count); for (int i = 0; i < response.Count; i++) { - Assert.Equal(oldTimeStamps[i].Millisecond, response[i]); + Assert.Equal(new DateTimeOffset(oldTimeStamps[i]).ToUnixTimeMilliseconds(), response[i].Value); } } } diff --git a/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs b/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs index 25dd2d05..d083166c 100644 --- a/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs +++ b/tests/NRedisStack.Tests/TimeSeries/TestDataTypes/TestTimeStamp.cs @@ -25,7 +25,7 @@ public void TestTimeStampImplicitCast() DateTime now = DateTime.UtcNow; ts = now; - Assert.Equal(now.Millisecond, ts); + Assert.Equal(new DateTimeOffset(now).ToUnixTimeMilliseconds(), ts.Value); } }