Skip to content

Commit 2251cb7

Browse files
catcherwongcatcherwong
authored
Merge pull request #368 from dotnetcore/dev
v1.6.0
2 parents fd4ca61 + bc4a017 commit 2251cb7

33 files changed

+3202
-2855
lines changed

‎README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ EasyCaching is an open source caching library that contains basic usages and som
1111

1212
| Platform | Build Server | Master Status | Dev Status |
1313
|--------- |------------- |---------|---------|
14-
| Github Action | Linux/Windows | [![Build&Test](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml) | [![Build&Test](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/dotnetcore/EasyCaching/actions/workflows/build.yml) |
14+
| Github Action | Linux/Windows | [![Build&Test](https://github.com/dotnetcore/EasyCaching/actions/workflows/buildandtest.yml/badge.svg)](https://github.com/dotnetcore/EasyCaching/actions/workflows/buildandtest.yml) | [![Build&Test](https://github.com/dotnetcore/EasyCaching/actions/workflows/buildandtest.yml/badge.svg)](https://github.com/dotnetcore/EasyCaching/actions/workflows/buildandtest.yml) |
1515

1616
## Nuget Packages
1717

@@ -160,9 +160,5 @@ See [ToDo List](docs/ToDoList.md)
160160

161161
Pull requests, issues and commentary!
162162

163-
Also can join our QQ group.
164-
165-
![](media/qqgroup.jpg?raw=true)
166-
167163
## License
168164
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdotnetcore%2FEasyCaching.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdotnetcore%2FEasyCaching?ref=badge_large)

‎build/releasenotes.props

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<Project>
22
<PropertyGroup>
33
<EasyCachingCorePackageNotes>
4-
1. Upgrading dependencies.
5-
</EasyCachingCorePackageNotes>
4+
1. IRedisCachingProvider Support SearchKeysAsync.
5+
2. IRedisCachingProvider Support ZRangeByScore/ZRangeByScoreAsync.
6+
</EasyCachingCorePackageNotes>
67
<EasyCachingMemcachedPackageNotes>
78
1. Upgrading dependencies.
9+
2. Throw exception when can not connect to server
810
</EasyCachingMemcachedPackageNotes>
911
<EasyCachingRedisPackageNotes>
10-
1. Fix removebyprefix when enable keyprefix.
11-
</EasyCachingRedisPackageNotes>
12+
1. IRedisCachingProvider Support SearchKeysAsync/ZRangeByScore/ZRangeByScoreAsync.
13+
2. Make clear exception message when serializer not match or notfound.
14+
3. Upgrading dependencies.
15+
</EasyCachingRedisPackageNotes>
1216
<EasyCachingSQLitePackageNotes>
1317
1. Upgrading dependencies.
1418
</EasyCachingSQLitePackageNotes>
@@ -37,16 +41,18 @@
3741
1. Upgrading dependencies.
3842
</EasyCachingProtobufPackageNotes>
3943
<EasyCachingCSRedisPackageNotes>
40-
1. Upgrading dependencies.
41-
</EasyCachingCSRedisPackageNotes>
44+
1. IRedisCachingProvider Support SearchKeysAsync/ZRangeByScore/ZRangeByScoreAsync.
45+
2. Make clear exception message when serializer not match or notfound.
46+
3. Upgrading dependencies.
47+
</EasyCachingCSRedisPackageNotes>
4248
<EasyCachingCSRedisBusPackageNotes>
4349
1. Upgrading dependencies.
4450
</EasyCachingCSRedisBusPackageNotes>
4551
<EasyCachingRedisBusPackageNotes>
4652
1. Upgrading dependencies.
4753
</EasyCachingRedisBusPackageNotes>
4854
<EasyCachingRabbitBusPackageNotes>
49-
1. Allow user to define client provided name.
55+
1. Upgrading dependencies.
5056
</EasyCachingRabbitBusPackageNotes>
5157
<EasyCachingDiskPackageNotes>
5258
1. Upgrading dependencies.

‎build/version.props

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project>
22
<PropertyGroup>
3-
<EasyCachingCorePackageVersion>1.5.1</EasyCachingCorePackageVersion>
4-
<EasyCachingMemcachedPackageVersion>1.5.1</EasyCachingMemcachedPackageVersion>
5-
<EasyCachingRedisPackageVersion>1.5.1</EasyCachingRedisPackageVersion>
6-
<EasyCachingSQLitePackageVersion>1.5.1</EasyCachingSQLitePackageVersion>
7-
<EasyCachingInMemoryPackageVersion>1.5.1</EasyCachingInMemoryPackageVersion>
8-
<EasyCachingHybridPackageVersion>1.5.1</EasyCachingHybridPackageVersion>
9-
<EasyCachingAspectCorePackageVersion>1.5.1</EasyCachingAspectCorePackageVersion>
10-
<EasyCachingCastlePackageVersion>1.5.1</EasyCachingCastlePackageVersion>
11-
<EasyCachingResponseCachingPackageVersion>1.5.1</EasyCachingResponseCachingPackageVersion>
12-
<EasyCachingJsonPackageVersion>1.5.1</EasyCachingJsonPackageVersion>
13-
<EasyCachingMessagePackPackageVersion>1.5.1</EasyCachingMessagePackPackageVersion>
14-
<EasyCachingProtobufPackageVersion>1.5.1</EasyCachingProtobufPackageVersion>
15-
<EasyCachingCSRedisPackageVersion>1.5.1</EasyCachingCSRedisPackageVersion>
16-
<EasyCachingRedisBusPackageVersion>1.5.1</EasyCachingRedisBusPackageVersion>
17-
<EasyCachingCSRedisBusPackageVersion>1.5.1</EasyCachingCSRedisBusPackageVersion>
18-
<EasyCachingRabbitBusPackageVersion>1.5.1</EasyCachingRabbitBusPackageVersion>
19-
<EasyCachingDiskPackageVersion>1.5.1</EasyCachingDiskPackageVersion>
20-
<EasyCachingMsExtPackageVersion>1.5.1</EasyCachingMsExtPackageVersion>
21-
<EasyCachingLiteDBPackageVersion>1.5.1</EasyCachingLiteDBPackageVersion>
22-
<EasyCachingSTJsonPackageVersion>1.5.1</EasyCachingSTJsonPackageVersion>
3+
<EasyCachingCorePackageVersion>1.6.0</EasyCachingCorePackageVersion>
4+
<EasyCachingMemcachedPackageVersion>1.6.0</EasyCachingMemcachedPackageVersion>
5+
<EasyCachingRedisPackageVersion>1.6.0</EasyCachingRedisPackageVersion>
6+
<EasyCachingSQLitePackageVersion>1.6.0</EasyCachingSQLitePackageVersion>
7+
<EasyCachingInMemoryPackageVersion>1.6.0</EasyCachingInMemoryPackageVersion>
8+
<EasyCachingHybridPackageVersion>1.6.0</EasyCachingHybridPackageVersion>
9+
<EasyCachingAspectCorePackageVersion>1.6.0</EasyCachingAspectCorePackageVersion>
10+
<EasyCachingCastlePackageVersion>1.6.0</EasyCachingCastlePackageVersion>
11+
<EasyCachingResponseCachingPackageVersion>1.6.0</EasyCachingResponseCachingPackageVersion>
12+
<EasyCachingJsonPackageVersion>1.6.0</EasyCachingJsonPackageVersion>
13+
<EasyCachingMessagePackPackageVersion>1.6.0</EasyCachingMessagePackPackageVersion>
14+
<EasyCachingProtobufPackageVersion>1.6.0</EasyCachingProtobufPackageVersion>
15+
<EasyCachingCSRedisPackageVersion>1.6.0</EasyCachingCSRedisPackageVersion>
16+
<EasyCachingRedisBusPackageVersion>1.6.0</EasyCachingRedisBusPackageVersion>
17+
<EasyCachingCSRedisBusPackageVersion>1.6.0</EasyCachingCSRedisBusPackageVersion>
18+
<EasyCachingRabbitBusPackageVersion>1.6.0</EasyCachingRabbitBusPackageVersion>
19+
<EasyCachingDiskPackageVersion>1.6.0</EasyCachingDiskPackageVersion>
20+
<EasyCachingMsExtPackageVersion>1.6.0</EasyCachingMsExtPackageVersion>
21+
<EasyCachingLiteDBPackageVersion>1.6.0</EasyCachingLiteDBPackageVersion>
22+
<EasyCachingSTJsonPackageVersion>1.6.0</EasyCachingSTJsonPackageVersion>
2323
</PropertyGroup>
2424
</Project>

‎bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="CSRedisCore" Version="3.6.8" />
35+
<PackageReference Include="CSRedisCore" Version="3.6.9" />
3636
</ItemGroup>
3737
<ItemGroup>
3838
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />

‎bus/EasyCaching.Bus.RabbitMQ/EasyCaching.Bus.RabbitMQ.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
39+
<PackageReference Include="RabbitMQ.Client" Version="6.2.4" />
4040
</ItemGroup>
4141

4242
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

‎bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
3232
</ItemGroup>
3333
<ItemGroup>
34-
<PackageReference Include="StackExchange.Redis" Version="2.2.88" />
34+
<PackageReference Include="StackExchange.Redis" Version="2.5.43" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />

‎interceptor/EasyCaching.Interceptor.Castle/EasyCaching.Interceptor.Castle.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</ItemGroup>
3737
<ItemGroup>
3838
<PackageReference Include="Castle.Core" Version="4.4.1" />
39-
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
39+
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
4040
<PackageReference Include="Autofac" Version="6.3.0" />
4141
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
4242
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

‎serialization/EasyCaching.Serialization.Protobuf/EasyCaching.Serialization.Protobuf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
3636
</ItemGroup>
3737
<ItemGroup>
38-
<PackageReference Include="protobuf-net" Version="3.0.101" />
38+
<PackageReference Include="protobuf-net" Version="3.1.0" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<Folder Include="Configurations\" />

‎serialization/EasyCaching.Serialization.SystemTextJson/EasyCaching.Serialization.SystemTextJson.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="System.Text.Json" Version="6.0.0" />
34+
<PackageReference Include="System.Text.Json" Version="6.0.3" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Keys.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,22 @@ public List<string> SearchKeys(string cacheKey, int? count)
106106

107107
return keys;
108108
}
109+
110+
public async Task<List<string>> SearchKeysAsync(string cacheKey, int? count)
111+
{
112+
var keys = new List<string>();
113+
114+
long nextCursor = 0;
115+
do
116+
{
117+
var scanResult = await _cache.ScanAsync(nextCursor, cacheKey, count ?? 250);
118+
nextCursor = scanResult.Cursor;
119+
var items = scanResult.Items;
120+
keys.AddRange(items);
121+
}
122+
while (nextCursor != 0);
123+
124+
return keys;
125+
}
109126
}
110127
}

0 commit comments

Comments
 (0)