Skip to content

Commit 825bdd4

Browse files
author
amirsolhi
committed
some cleanups
1 parent 033d6d8 commit 825bdd4

File tree

4 files changed

+62
-33
lines changed

4 files changed

+62
-33
lines changed

‎sample/EasyCaching.Demo.ConsoleApp/EasyCaching.Demo.ConsoleApp.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@
2020
<ProjectReference Include="..\..\src\EasyCaching.Memcached\EasyCaching.Memcached.csproj" />
2121
<ProjectReference Include="..\..\src\EasyCaching.Redis\EasyCaching.Redis.csproj" />
2222
<ProjectReference Include="..\..\src\EasyCaching.ResponseCaching\EasyCaching.ResponseCaching.csproj" />
23+
<ProjectReference Include="..\..\src\EasyCaching.SQLite\EasyCaching.SQLite.csproj" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
2327
<ProjectReference Include="..\..\serialization\EasyCaching.Serialization.Json\EasyCaching.Serialization.Json.csproj" />
2428
<ProjectReference Include="..\..\serialization\EasyCaching.Serialization.MessagePack\EasyCaching.Serialization.MessagePack.csproj" />
2529
<ProjectReference Include="..\..\serialization\EasyCaching.Serialization.Protobuf\EasyCaching.Serialization.Protobuf.csproj" />
26-
<ProjectReference Include="..\..\src\EasyCaching.SQLite\EasyCaching.SQLite.csproj" />
30+
<ProjectReference Include="..\..\serialization\EasyCaching.Serialization.MemoryPack\EasyCaching.Serialization.MemoryPack.csproj" />
2731
</ItemGroup>
28-
2932
</Project>

‎sample/EasyCaching.Demo.ConsoleApp/Program.cs‎

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
using System.Threading.Tasks;
1+
using EasyCaching.Serialization.MemoryPack;
22

33
namespace EasyCaching.Demo.ConsoleApp
44
{
55
using EasyCaching.Core;
66
using EasyCaching.SQLite;
7+
using MemoryPack;
78
using Microsoft.Extensions.DependencyInjection;
89
using System;
910

@@ -16,15 +17,18 @@ static void Main(string[] args)
1617
IServiceCollection services = new ServiceCollection();
1718
services.AddEasyCaching(option =>
1819
{
20+
option.WithMemoryPack(configure =>
21+
{
22+
}, "mempack");
23+
1924
option.UseInMemory("m1");
2025

21-
// option.UseRedis(config =>
22-
// {
23-
// config.DBConfig = new Redis.RedisDBOptions { Configuration = "localhost" };
24-
// config.SerializerName = "json";
25-
// }, "r1");
26-
//
27-
26+
option.UseRedis((options) =>
27+
{
28+
options.SerializerName = "mempack";
29+
options.DBConfig.Endpoints.Add(new Core.Configurations.ServerEndPoint("localhost", 6388));
30+
}, "r1");
31+
2832
option.UseSQLite(c =>
2933
{
3034
c.DBConfig = new SQLiteDBOptions
@@ -43,7 +47,7 @@ static void Main(string[] args)
4347

4448
IServiceProvider serviceProvider = services.BuildServiceProvider();
4549
var factory = serviceProvider.GetService<IEasyCachingProviderFactory>();
46-
50+
4751
// var redisCache = factory.GetCachingProvider("r1");
4852
//
4953
// redisCache.Set<Product>("rkey", new Product() { Name = "test" }, TimeSpan.FromSeconds(20));
@@ -55,41 +59,63 @@ static void Main(string[] args)
5559
// Console.WriteLine($"redis cache get value, {redisVal.HasValue} {redisVal.IsNull} {redisVal.Value}");
5660

5761

58-
59-
var mCache = factory.GetCachingProvider("m1");
60-
61-
mCache.Set<Product>("mkey1", new Product() { Name = "test" }, TimeSpan.FromSeconds(20));
6262

63-
var mVal1 = mCache.Get<Product>("mkey1");
63+
var rCache = factory.GetCachingProvider("r1");
64+
65+
var prod = new Product()
66+
{
67+
Name = "Name1",
68+
Lastname = "Lastname1",
69+
Inner = new()
70+
{
71+
Name = "Name2",
72+
Lastname = "Lastname2"
73+
}
74+
};
75+
76+
prod.Inner.Inner = prod;
77+
rCache.Set<Product>("mkey1", prod, TimeSpan.FromSeconds(20));
78+
79+
var mVal1 = rCache.Get<Product>("mkey1");
80+
81+
rCache.Set<string>("mkey", "mvalue", TimeSpan.FromSeconds(20));
82+
83+
var mVal = rCache.Get<string>("mkey");
84+
85+
var mAllKey = rCache.GetAllKeysByPrefix("mk");
6486

65-
mCache.Set<string>("mkey", "mvalue", TimeSpan.FromSeconds(20));
66-
67-
var mVal = mCache.Get<string>("mkey");
68-
69-
var mAllKey = mCache.GetAllKeysByPrefix("mk");
70-
7187
Console.WriteLine($"in-memory cache get value, {mVal.HasValue} {mVal.IsNull} {mVal.Value} ");
7288

73-
89+
7490
var sCache = factory.GetCachingProvider("s1");
7591

76-
92+
7793
sCache.Set<string>("skey", "svalue", TimeSpan.FromSeconds(20));
7894

79-
95+
8096
var sVal = sCache.Get<string>("skey");
8197

82-
98+
8399
Console.WriteLine($"sqlite cache get value, {sVal.HasValue} {sVal.IsNull} {sVal.Value} ");
84100

85101
Console.ReadKey();
86102
}
87103
}
88104

89-
public class Product
105+
[MemoryPackable(GenerateType.CircularReference)]
106+
public partial class Product
90107
{
91108

109+
[MemoryPackOrder(0)]
92110
public string Name { get; set; }
111+
112+
[MemoryPackOrder(1)]
113+
114+
public string Lastname { get; set; }
115+
116+
[MemoryPackOrder(2)]
117+
118+
public Product Inner { set; get; }
93119
}
94120
}
95121

‎test/EasyCaching.UnitTests/CachingTests/BaseCachingProviderTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ public async Task Remove_Cached_Value_Async_Should_Succeed()
765765
var cacheValue = "value";
766766

767767
await _provider.SetAsync(cacheKey, cacheValue, _defaultTs);
768-
var valBeforeRemove = await _provider.GetAsync<string>(cacheKey, null, _defaultTs);
768+
var valBeforeRemove = await _provider.GetAsync<string>(cacheKey, () => null, _defaultTs);
769769
Assert.NotNull(valBeforeRemove);
770770

771771
await _provider.RemoveAsync(cacheKey);
@@ -870,15 +870,15 @@ protected virtual async Task RemoveByPrefixAsync_Should_Succeed()
870870
}
871871

872872
#endregion
873-
873+
874874
#region RemoveByPattern/RemoveByPatternAsync
875875

876876
[Fact]
877877
public virtual void RemoveByPattern_Should_Succeed()
878878
{
879879
SetCacheItem("garden:pots:flowers", "ok");
880880
SetCacheItem("garden:pots:flowers:test", "ok");
881-
SetCacheItem("garden:flowerspots:test", "ok" );
881+
SetCacheItem("garden:flowerspots:test", "ok");
882882
SetCacheItem("boo:foo", "ok");
883883
SetCacheItem("boo:test:foo", "ok");
884884
SetCacheItem("sky:birds:bar", "ok");
@@ -933,13 +933,13 @@ public virtual void RemoveByPattern_Should_Succeed()
933933
Assert.False(val15.HasValue);
934934
Assert.False(val16.HasValue);
935935
}
936-
936+
937937
[Fact]
938938
public virtual async Task RemoveByPatternAsync_Should_Succeed()
939939
{
940940
SetCacheItem("garden:pots:flowers", "ok");
941941
SetCacheItem("garden:pots:flowers:test", "ok");
942-
SetCacheItem("garden:flowerspots:test", "ok" );
942+
SetCacheItem("garden:flowerspots:test", "ok");
943943
SetCacheItem("boo:foo", "ok");
944944
SetCacheItem("boo:test:foo", "ok");
945945
SetCacheItem("sky:birds:bar", "ok");

‎test/EasyCaching.UnitTests/SerializerTests/MemoryPackSerializerTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class MemoryPackSerializerTest : BaseSerializerTest
1010
{
1111
public MemoryPackSerializerTest()
1212
{
13-
_serializer = new DefaultMemoryPackSerializer("test");
13+
_serializer = new DefaultMemoryPackSerializer("mempack");
1414
}
1515

1616
//This should be overrided becuse it is not supported by memory-pack

0 commit comments

Comments
 (0)