Skip to content

Commit b34b48c

Browse files
JeffreySuJeffreySu
authored
Merge pull request #331 from Senparc/Develop
Develop
2 parents 27d3774 + 657694e commit b34b48c

File tree

20 files changed

+353
-172
lines changed

20 files changed

+353
-172
lines changed

‎src/Senparc.CO2NET.APM.Tests/DataOperationTests.cs‎

Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
using Senparc.CO2NET.Tests;
44
using System;
55
using Moq;
6+
using System.Threading;
7+
using System.Collections.Generic;
8+
using System.Threading.Tasks;
69

710
namespace Senparc.CO2NET.APM.Tests
811
{
@@ -13,81 +16,81 @@ public class DataOperationTests : BaseTest
1316

1417
public DataOperationTests()
1518
{
16-
19+
Senparc.CO2NET.APM.Config.EnableAPM = true;
1720
}
1821

19-
private void BuildTestData(DataOperation dataOperation)
22+
private async Task BuildTestDataAsync(DataOperation dataOperation)
2023
{
21-
dataOperation.SetAsync("Memory", 4567, dateTime: SystemTime.Now.AddDays(-1)).Wait();//A simple example
22-
dataOperation.SetAsync("Memory", 6789, dateTime: SystemTime.Now.AddMinutes(-2)).Wait();
23-
24-
dataOperation.SetAsync("CPU", .65, dateTime: SystemTime.Now.AddMinutes(-2)).Wait();
25-
dataOperation.SetAsync("CPU", .78, dateTime: SystemTime.Now.AddMinutes(-2)).Wait();
26-
dataOperation.SetAsync("CPU", .75, dateTime: SystemTime.Now.AddMinutes(-2)).Wait();
27-
dataOperation.SetAsync("CPU", .92, dateTime: SystemTime.Now.AddMinutes(-1)).Wait();
28-
dataOperation.SetAsync("CPU", .48, dateTime: SystemTime.Now.AddMinutes(-1)).Wait();
29-
30-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-3)).Wait();
31-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-3)).Wait();
32-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-2)).Wait();
33-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-2)).Wait();
34-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-1)).Wait();
35-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-1)).Wait();
36-
37-
dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now);//Current task, blocking the space //.Wait()
38-
39-
24+
_= dataOperation.SetAsync("Memory", 4567, dateTime: SystemTime.Now.AddDays(-1));//A simple example
25+
_= dataOperation.SetAsync("Memory", 6789, dateTime: SystemTime.Now.AddMinutes(-2));
26+
27+
_= dataOperation.SetAsync("CPU", .65, dateTime: SystemTime.Now.AddMinutes(-2));
28+
_= dataOperation.SetAsync("CPU", .78, dateTime: SystemTime.Now.AddMinutes(-2));
29+
_= dataOperation.SetAsync("CPU", .75, dateTime: SystemTime.Now.AddMinutes(-2));
30+
_= dataOperation.SetAsync("CPU", .92, dateTime: SystemTime.Now.AddMinutes(-1));
31+
_= dataOperation.SetAsync("CPU", .48, dateTime: SystemTime.Now.AddMinutes(-1));
32+
33+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-3));
34+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-3));
35+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-2));
36+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-2));
37+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-1));
38+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now.AddMinutes(-1));
39+
40+
_= dataOperation.SetAsync("Accessor", 1, dateTime: SystemTime.Now);
41+
42+
Thread.Sleep(1000); // wait for all items be cached
4043
}
4144

4245
[TestMethod]
43-
public void SetAndGetTest()
46+
public async Task SetAndGetTest()
4447
{
4548
DataOperation dataOperation = new DataOperation(domainPrefix + "SetAndGetTest");
46-
BuildTestData(dataOperation);
49+
await BuildTestDataAsync(dataOperation);
4750

48-
var memoryData = dataOperation.GetDataItemListAsync("Memory").Result;
51+
var memoryData = await dataOperation.GetDataItemListAsync("Memory");
4952
Assert.AreEqual(2, memoryData.Count);
5053

51-
var cpuData = dataOperation.GetDataItemListAsync("CPU").Result;
54+
var cpuData = await dataOperation.GetDataItemListAsync("CPU");
5255
Assert.AreEqual(5, cpuData.Count);
5356

54-
var viewData = dataOperation.GetDataItemListAsync("Visitor Volume").Result;
55-
Assert.AreEqual(7, viewData.Count);
57+
//var viewData = dataOperation.GetDataItemListAsync("Visitor Volume").Result;
58+
//Assert.AreEqual(7, viewData.Count);
5659
}
5760

5861

5962
[TestMethod]
60-
public void ReadAndCleanDataItemsTest()
63+
public async Task ReadAndCleanDataItemsTest()
6164
{
6265
DataOperation dataOperation = new DataOperation(domainPrefix + "ReadAndCleanDataItemsTest");
63-
BuildTestData(dataOperation);
64-
var result = dataOperation.ReadAndCleanDataItemsAsync(true, false).Result;//Processing the current task before the previous task
66+
await BuildTestDataAsync(dataOperation);
67+
var result = await dataOperation.ReadAndCleanDataItemsAsync(true, false);//Processing the current task before the previous task
6568

6669
Assert.IsNotNull(result);
6770
Assert.AreEqual(3, result.Count);//Memory and CPU resources, limited to 3 units
6871
Console.WriteLine(result.ToJson());
6972
Console.WriteLine("===============");
7073

7174
//Check if the current task has received the previous task
72-
var memoryData = dataOperation.GetDataItemListAsync("内存").Result;
75+
var memoryData = await dataOperation.GetDataItemListAsync("Memory");
7376
Assert.AreEqual(0, memoryData.Count);
7477

75-
var cpuData = dataOperation.GetDataItemListAsync("CPU").Result;
78+
var cpuData = await dataOperation.GetDataItemListAsync("CPU");
7679
Assert.AreEqual(0, cpuData.Count);
7780

78-
var viewData = dataOperation.GetDataItemListAsync("Visitor Volume").Result;
79-
Assert.AreEqual(1, viewData.Count);//The current task will not be interrupted
81+
//var viewData = dataOperation.GetDataItemListAsync("Visitor Volume").Result;
82+
//Assert.AreEqual(1, viewData.Count);//The current task will not be interrupted
8083

8184
//Simulate current time
8285

8386
}
8487

8588
[TestMethod]
86-
public void ReadAndCleanDataItems_KeepTodayDataTest()
89+
public async Task ReadAndCleanDataItems_KeepTodayDataTest()
8790
{
8891
DataOperation dataOperation = new DataOperation(domainPrefix + "ReadAndCleanDataItems_KeepTodayDataTest");
89-
BuildTestData(dataOperation);
90-
var result = dataOperation.ReadAndCleanDataItemsAsync(true, true).Result;//Only record before the previous task
92+
await BuildTestDataAsync(dataOperation);
93+
var result = await dataOperation.ReadAndCleanDataItemsAsync(true, true);//Only record before the previous task
9194

9295
Assert.IsNotNull(result);
9396
Assert.AreEqual(3, result.Count);//Memory and CPU resources, limited to 3 units
@@ -101,8 +104,8 @@ public void ReadAndCleanDataItems_KeepTodayDataTest()
101104
var cpuData = dataOperation.GetDataItemListAsync("CPU").Result;
102105
Assert.AreEqual(5, cpuData.Count);//Clear all elements in the list
103106

104-
var viewData = dataOperation.GetDataItemListAsync("Visitor Volumn").Result;
105-
Assert.AreEqual(7, viewData.Count);//Clear all elements in the list
107+
//var viewData = dataOperation.GetDataItemListAsync("Visitor Volumn").Result;
108+
//Assert.AreEqual(7, viewData.Count);//Clear all elements in the list
106109

107110
//Simulate current time
108111

‎src/Senparc.CO2NET.APM/DataOperation.cs‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ 2. DataOperation.KindNameStore uses ConcurrentDictionary type
4747

4848

4949
using Senparc.CO2NET.APM.Exceptions;
50+
using Senparc.CO2NET.Cache;
5051
using Senparc.CO2NET.Trace;
5152
using System;
5253
using System.Collections.Concurrent;
@@ -72,6 +73,8 @@ public class DataOperation
7273
//TODO: Consider distributed scenarios, preferably stored in cache
7374
private static ConcurrentDictionary<string, ConcurrentDictionary<string, DateTimeOffset>> KindNameStore { get; set; } //= new Dictionary<string, Dictionary<string, DateTimeOffset>>();
7475

76+
private IBaseObjectCacheStrategy _cacheStragety;
77+
7578
private string BuildFinalKey(string kindName)
7679
{
7780
return $"{_domainKey}:{kindName}";
@@ -88,13 +91,12 @@ private async Task RegisterFinalKeyAsync(string kindName)
8891
return;
8992
}
9093

91-
var cacheStragety = Cache.CacheStrategyFactory.GetObjectCacheStrategyInstance();
9294
var kindNameKey = $"{_domainKey}:_KindNameStore";
93-
var keyList = await cacheStragety.GetAsync<List<string>>(kindNameKey, true).ConfigureAwait(false) ?? new List<string>();
95+
var keyList = await _cacheStragety.GetAsync<List<string>>(kindNameKey, true).ConfigureAwait(false) ?? new List<string>();
9496
if (!keyList.Contains(kindName))
9597
{
9698
keyList.Add(kindName);
97-
await cacheStragety.SetAsync(kindNameKey, keyList, isFullKey: true).ConfigureAwait(false);//Permanent storage
99+
await _cacheStragety.SetAsync(kindNameKey, keyList, isFullKey: true).ConfigureAwait(false);//Permanent storage
98100
}
99101

100102
KindNameStore[_domain][kindName] = SystemTime.Now;
@@ -104,10 +106,20 @@ private async Task RegisterFinalKeyAsync(string kindName)
104106
/// DataOperation constructor
105107
/// </summary>
106108
/// <param name="domain">Domain, the smallest unit of statistics, can be a website or a module</param>
107-
public DataOperation(string domain)
109+
public DataOperation(string domain) : this(domain, null)
110+
{
111+
112+
}
113+
114+
/// <summary>
115+
/// DataOperation constructor
116+
/// </summary>
117+
/// <param name="domain">Domain, the smallest unit of statistics, can be a website or a module</param>
118+
public DataOperation(string domain, IBaseObjectCacheStrategy cacheStrategy)
108119
{
109120
_domain = domain ?? "GLOBAL";//If not provided, it defaults to GLOBAL, shared globally
110121
_domainKey = $"{CACHE_NAMESPACE}:{_domain}";
122+
this._cacheStragety = cacheStrategy ?? CO2NET.Cache.CacheStrategyFactory.GetObjectCacheStrategyInstance();
111123

112124
if (!KindNameStore.ContainsKey(_domain))
113125
{
@@ -157,16 +169,16 @@ public async Task<DataItem> SetAsync(string kindName, double value, object data
157169
try
158170
{
159171
var dt1 = SystemTime.Now;
160-
var cacheStragety = Cache.CacheStrategyFactory.GetObjectCacheStrategyInstance();
172+
161173
var finalKey = BuildFinalKey(kindName);
162174
//Use sync lock to determine write order
163-
using (await cacheStragety.BeginCacheLockAsync("SenparcAPM", finalKey).ConfigureAwait(false))
175+
using (await _cacheStragety.BeginCacheLockAsync("SenparcAPM", finalKey).ConfigureAwait(false))
164176
{
165177

166178

167179
var list = await GetDataItemListAsync(kindName).ConfigureAwait(false);
168180
list.Add(dataItem);
169-
await cacheStragety.SetAsync(finalKey, list, Config.DataExpire, true).ConfigureAwait(false);
181+
await _cacheStragety.SetAsync(finalKey, list, Config.DataExpire, true).ConfigureAwait(false);
170182

171183
await RegisterFinalKeyAsync(kindName).ConfigureAwait(false);//Register Key
172184

@@ -197,9 +209,10 @@ public async Task<List<DataItem>> GetDataItemListAsync(string kindName)
197209
{
198210
try
199211
{
200-
var cacheStragety = Cache.CacheStrategyFactory.GetObjectCacheStrategyInstance();
212+
201213
var finalKey = BuildFinalKey(kindName);
202-
var list = await cacheStragety.GetAsync<List<DataItem>>(finalKey, true).ConfigureAwait(false);
214+
215+
var list = await _cacheStragety.GetAsync<List<DataItem>>(finalKey, true).ConfigureAwait(false);
203216

204217
if (list != null)
205218
{
@@ -227,7 +240,7 @@ public async Task<List<MinuteDataPack>> ReadAndCleanDataItemsAsync(bool removeRe
227240
{
228241
var dt1 = SystemTime.Now;
229242

230-
var cacheStragety = Cache.CacheStrategyFactory.GetObjectCacheStrategyInstance();
243+
231244
Dictionary<string, List<DataItem>> tempDataItems = new Dictionary<string, List<DataItem>>();
232245

233246
var systemNow = SystemTime.Now.UtcDateTime;//Unified UTC time
@@ -238,7 +251,7 @@ public async Task<List<MinuteDataPack>> ReadAndCleanDataItemsAsync(bool removeRe
238251
{
239252
var kindName = item.Key;
240253
var finalKey = BuildFinalKey(kindName);
241-
using (await cacheStragety.BeginCacheLockAsync("SenparcAPM", finalKey).ConfigureAwait(false))
254+
using (await _cacheStragety.BeginCacheLockAsync("SenparcAPM", finalKey).ConfigureAwait(false))
242255
{
243256
var list = await GetDataItemListAsync(item.Key).ConfigureAwait(false);//Get list
244257
var completedStatData = list.Where(z => z.DateTime < nowMinuteTime).ToList();//All data within the statistical range
@@ -254,13 +267,13 @@ public async Task<List<MinuteDataPack>> ReadAndCleanDataItemsAsync(bool removeRe
254267
if (tobeRemove.Count() == list.Count())
255268
{
256269
//All deleted
257-
await cacheStragety.RemoveFromCacheAsync(finalKey, true).ConfigureAwait(false);//Delete
270+
await _cacheStragety.RemoveFromCacheAsync(finalKey, true).ConfigureAwait(false);//Delete
258271
}
259272
else
260273
{
261274
//Partially deleted
262275
var newList = list.Except(tobeRemove).ToList();
263-
await cacheStragety.SetAsync(finalKey, newList, Config.DataExpire, true).ConfigureAwait(false);
276+
await _cacheStragety.SetAsync(finalKey, newList, Config.DataExpire, true).ConfigureAwait(false);
264277
}
265278
}
266279
}

‎src/Senparc.CO2NET.APM/Senparc.CO2NET.APM.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
4-
<Version>2.1.0.1</Version>
4+
<Version>2.1.1</Version>
55
<AssemblyName>Senparc.CO2NET.APM</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.APM</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -38,6 +38,7 @@
3838
[2024-09-11] v1.4.6 Update Cache, remove InsertToCache(), add Count(prefix)
3939
[2024-11-28] v2.0.1-beta1 Add UseLowerCaseApiName property for SenparcSetting
4040
[2024-12-04] v2.1.0-beta1 update Start() method, set SenparcSetting in Config when AddSenparcGlobalService() run
41+
[2025-09-06] v2.1.1 base module update
4142
</PackageReleaseNotes>
4243
</PropertyGroup>
4344
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

‎src/Senparc.CO2NET.Cache.CsRedis.Tests/InitTests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void AutoRegisterConfigurationTest()
3838
Senparc.CO2NET.Config.SenparcSetting.IsDebug = true;
3939
Senparc.CO2NET.Config.SenparcSetting.Cache_Redis_Configuration = redisServer;
4040

41-
4241
//var senparcSetting = new SenparcSetting()
4342
//{
4443
// IsDebug = true,
@@ -51,9 +50,13 @@ public void AutoRegisterConfigurationTest()
5150
.UseSenparcGlobal();
5251
Assert.AreEqual(null, RedisManager.ConfigurationOption);// Not registered yet
5352

53+
5454
Register.SetConfigurationOption(redisServer);
5555
Assert.AreEqual(redisServer, RedisManager.ConfigurationOption);
5656

57+
//以下会立即将全局缓存设置为 Redis
58+
Register.UseKeyValueRedisNow();//键值对缓存策略（推荐）
59+
5760
var currentCache = CacheStrategyFactory.GetObjectCacheStrategyInstance();
5861
Assert.IsInstanceOfType(currentCache, typeof(RedisObjectCacheStrategy));
5962
}

‎src/Senparc.CO2NET.Cache.CsRedis.Tests/RedisHashSetTest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ public class RedisHashSetTest
1414
[TestMethod]
1515
public void HashSetSetTest()
1616
{
17-
RedisManager.ConfigurationOption = "localhost:6379";
17+
RedisManager.ConfigurationOption = "10.37.129.2:6379";
18+
Senparc.CO2NET.Config.SenparcSetting.Cache_Redis_Configuration = RedisManager.ConfigurationOption;
19+
CsRedis.Register.SetConfigurationOption(RedisManager.ConfigurationOption);
20+
CsRedis.Register.UseKeyValueRedisNow();
1821
CacheStrategyFactory.RegisterObjectCacheStrategy(() => RedisHashSetObjectCacheStrategy.Instance);
1922
var cacheStrategy = CacheStrategyFactory.GetObjectCacheStrategyInstance();
2023

‎src/Senparc.CO2NET.Cache.CsRedis.Tests/RedisTest.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ public class RedisTest
2727
[TestMethod]
2828
public void SetTest()
2929
{
30-
RedisManager.ConfigurationOption = "localhost:6379";
30+
Config.SenparcSetting.Cache_Redis_Configuration = "10.37.129.2:6379";
31+
CsRedis.Register.SetConfigurationOption(Config.SenparcSetting.Cache_Redis_Configuration);
32+
CsRedis.Register.UseKeyValueRedisNow();
33+
3134
CacheStrategyFactory.RegisterObjectCacheStrategy(() => RedisObjectCacheStrategy.Instance);
3235
var cacheStrategy = CacheStrategyFactory.GetObjectCacheStrategyInstance();
3336

‎src/Senparc.CO2NET.Cache.CsRedis.Tests/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"SenparcSetting": {
1010
"IsDebug": true,
1111
"DefaultCacheNamespace": "DefaultCacheTest",
12-
"Cache_Redis_Configuration": "localhost:6379"//不包含密码
12+
"Cache_Redis_Configuration": "10.37.129.2:6379" //不包含密码
1313
},
1414
//Senparc.Weixin SDK 设置
1515
"SenparcWeixinSetting": {

‎src/Senparc.CO2NET.Cache.CsRedis/ObjectCacheStrategy/BaseRedisObjectCacheStrategy.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public CSRedis.CSRedisClient Client
3636
{
3737
get
3838
{
39-
if (_client == null && CanUseRedis())
39+
if (_client == null && RedisManager.CanUseRedis())
4040
{
4141
_client = new CSRedis.CSRedisClient(Config.SenparcSetting.Cache_Redis_Configuration);
4242
}
@@ -49,18 +49,10 @@ protected BaseRedisObjectCacheStrategy()
4949
//Client = new CSRedis.CSRedisClient(Config.SenparcSetting.Cache_Redis_Configuration);
5050
}
5151

52-
static bool CanUseRedis()
53-
{
54-
return !string.IsNullOrEmpty(RedisManager.ConfigurationOption) ||
55-
(!string.IsNullOrEmpty(Config.SenparcSetting.Cache_Redis_Configuration) &&
56-
Config.SenparcSetting.Cache_Redis_Configuration != "Redis配置" &&
57-
Config.SenparcSetting.Cache_Redis_Configuration != "#{Cache_Redis_Configuration}#");
58-
}
59-
6052
static BaseRedisObjectCacheStrategy()
6153
{
6254
//Automatically register connection string information
63-
if (CanUseRedis())
55+
if (RedisManager.CanUseRedis())
6456
{
6557
RedisManager.ConfigurationOption = Config.SenparcSetting.Cache_Redis_Configuration;
6658
}

‎src/Senparc.CO2NET.Cache.CsRedis/RedisManager.cs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,18 @@ namespace Senparc.CO2NET.Cache.CsRedis
1010
public class RedisManager
1111
{
1212
public static string ConfigurationOption { get; set; }
13-
}
13+
14+
/// <summary>
15+
/// Determine whether the current project can enable Redis through the default configuration
16+
/// </summary>
17+
/// <returns></returns>
18+
public static bool CanUseRedis(string connectionStr = null)
19+
{
20+
connectionStr ??= RedisManager.ConfigurationOption;
21+
return !string.IsNullOrEmpty(connectionStr) ||
22+
(!string.IsNullOrEmpty(Config.SenparcSetting.Cache_Redis_Configuration) &&
23+
Config.SenparcSetting.Cache_Redis_Configuration != "Redis配置" &&
24+
Config.SenparcSetting.Cache_Redis_Configuration != "#{Cache_Redis_Configuration}#");
25+
}
26+
}
1427
}

0 commit comments

Comments
 (0)