Skip to content

Commit

Permalink
Merge pull request #368 from dotnetcore/dev
Browse files Browse the repository at this point in the history
v1.6.0
  • Loading branch information
catcherwong authored May 2, 2022
2 parents fd4ca61 + bc4a017 commit 2251cb7
Show file tree
Hide file tree
Showing 33 changed files with 3,202 additions and 2,855 deletions.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EasyCaching is an open source caching library that contains basic usages and som

| Platform | Build Server | Master Status | Dev Status |
|--------- |------------- |---------|---------|
| 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) |
| 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) |

## Nuget Packages

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

Pull requests, issues and commentary!

Also can join our QQ group.

![](media/qqgroup.jpg?raw=true)

## License
[![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)
20 changes: 13 additions & 7 deletions build/releasenotes.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<Project>
<PropertyGroup>
<EasyCachingCorePackageNotes>
1. Upgrading dependencies.
</EasyCachingCorePackageNotes>
1. IRedisCachingProvider Support SearchKeysAsync.
2. IRedisCachingProvider Support ZRangeByScore/ZRangeByScoreAsync.
</EasyCachingCorePackageNotes>
<EasyCachingMemcachedPackageNotes>
1. Upgrading dependencies.
2. Throw exception when can not connect to server
</EasyCachingMemcachedPackageNotes>
<EasyCachingRedisPackageNotes>
1. Fix removebyprefix when enable keyprefix.
</EasyCachingRedisPackageNotes>
1. IRedisCachingProvider Support SearchKeysAsync/ZRangeByScore/ZRangeByScoreAsync.
2. Make clear exception message when serializer not match or notfound.
3. Upgrading dependencies.
</EasyCachingRedisPackageNotes>
<EasyCachingSQLitePackageNotes>
1. Upgrading dependencies.
</EasyCachingSQLitePackageNotes>
Expand Down Expand Up @@ -37,16 +41,18 @@
1. Upgrading dependencies.
</EasyCachingProtobufPackageNotes>
<EasyCachingCSRedisPackageNotes>
1. Upgrading dependencies.
</EasyCachingCSRedisPackageNotes>
1. IRedisCachingProvider Support SearchKeysAsync/ZRangeByScore/ZRangeByScoreAsync.
2. Make clear exception message when serializer not match or notfound.
3. Upgrading dependencies.
</EasyCachingCSRedisPackageNotes>
<EasyCachingCSRedisBusPackageNotes>
1. Upgrading dependencies.
</EasyCachingCSRedisBusPackageNotes>
<EasyCachingRedisBusPackageNotes>
1. Upgrading dependencies.
</EasyCachingRedisBusPackageNotes>
<EasyCachingRabbitBusPackageNotes>
1. Allow user to define client provided name.
1. Upgrading dependencies.
</EasyCachingRabbitBusPackageNotes>
<EasyCachingDiskPackageNotes>
1. Upgrading dependencies.
Expand Down
40 changes: 20 additions & 20 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Project>
<PropertyGroup>
<EasyCachingCorePackageVersion>1.5.1</EasyCachingCorePackageVersion>
<EasyCachingMemcachedPackageVersion>1.5.1</EasyCachingMemcachedPackageVersion>
<EasyCachingRedisPackageVersion>1.5.1</EasyCachingRedisPackageVersion>
<EasyCachingSQLitePackageVersion>1.5.1</EasyCachingSQLitePackageVersion>
<EasyCachingInMemoryPackageVersion>1.5.1</EasyCachingInMemoryPackageVersion>
<EasyCachingHybridPackageVersion>1.5.1</EasyCachingHybridPackageVersion>
<EasyCachingAspectCorePackageVersion>1.5.1</EasyCachingAspectCorePackageVersion>
<EasyCachingCastlePackageVersion>1.5.1</EasyCachingCastlePackageVersion>
<EasyCachingResponseCachingPackageVersion>1.5.1</EasyCachingResponseCachingPackageVersion>
<EasyCachingJsonPackageVersion>1.5.1</EasyCachingJsonPackageVersion>
<EasyCachingMessagePackPackageVersion>1.5.1</EasyCachingMessagePackPackageVersion>
<EasyCachingProtobufPackageVersion>1.5.1</EasyCachingProtobufPackageVersion>
<EasyCachingCSRedisPackageVersion>1.5.1</EasyCachingCSRedisPackageVersion>
<EasyCachingRedisBusPackageVersion>1.5.1</EasyCachingRedisBusPackageVersion>
<EasyCachingCSRedisBusPackageVersion>1.5.1</EasyCachingCSRedisBusPackageVersion>
<EasyCachingRabbitBusPackageVersion>1.5.1</EasyCachingRabbitBusPackageVersion>
<EasyCachingDiskPackageVersion>1.5.1</EasyCachingDiskPackageVersion>
<EasyCachingMsExtPackageVersion>1.5.1</EasyCachingMsExtPackageVersion>
<EasyCachingLiteDBPackageVersion>1.5.1</EasyCachingLiteDBPackageVersion>
<EasyCachingSTJsonPackageVersion>1.5.1</EasyCachingSTJsonPackageVersion>
<EasyCachingCorePackageVersion>1.6.0</EasyCachingCorePackageVersion>
<EasyCachingMemcachedPackageVersion>1.6.0</EasyCachingMemcachedPackageVersion>
<EasyCachingRedisPackageVersion>1.6.0</EasyCachingRedisPackageVersion>
<EasyCachingSQLitePackageVersion>1.6.0</EasyCachingSQLitePackageVersion>
<EasyCachingInMemoryPackageVersion>1.6.0</EasyCachingInMemoryPackageVersion>
<EasyCachingHybridPackageVersion>1.6.0</EasyCachingHybridPackageVersion>
<EasyCachingAspectCorePackageVersion>1.6.0</EasyCachingAspectCorePackageVersion>
<EasyCachingCastlePackageVersion>1.6.0</EasyCachingCastlePackageVersion>
<EasyCachingResponseCachingPackageVersion>1.6.0</EasyCachingResponseCachingPackageVersion>
<EasyCachingJsonPackageVersion>1.6.0</EasyCachingJsonPackageVersion>
<EasyCachingMessagePackPackageVersion>1.6.0</EasyCachingMessagePackPackageVersion>
<EasyCachingProtobufPackageVersion>1.6.0</EasyCachingProtobufPackageVersion>
<EasyCachingCSRedisPackageVersion>1.6.0</EasyCachingCSRedisPackageVersion>
<EasyCachingRedisBusPackageVersion>1.6.0</EasyCachingRedisBusPackageVersion>
<EasyCachingCSRedisBusPackageVersion>1.6.0</EasyCachingCSRedisBusPackageVersion>
<EasyCachingRabbitBusPackageVersion>1.6.0</EasyCachingRabbitBusPackageVersion>
<EasyCachingDiskPackageVersion>1.6.0</EasyCachingDiskPackageVersion>
<EasyCachingMsExtPackageVersion>1.6.0</EasyCachingMsExtPackageVersion>
<EasyCachingLiteDBPackageVersion>1.6.0</EasyCachingLiteDBPackageVersion>
<EasyCachingSTJsonPackageVersion>1.6.0</EasyCachingSTJsonPackageVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion bus/EasyCaching.Bus.CSRedis/EasyCaching.Bus.CSRedis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.6.8" />
<PackageReference Include="CSRedisCore" Version="3.6.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="RabbitMQ.Client" Version="6.2.2" />
<PackageReference Include="RabbitMQ.Client" Version="6.2.4" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
Expand Down
2 changes: 1 addition & 1 deletion bus/EasyCaching.Bus.Redis/EasyCaching.Bus.Redis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<None Include="../../media/nuget-icon.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="StackExchange.Redis" Version="2.2.88" />
<PackageReference Include="StackExchange.Redis" Version="2.5.43" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.4.1" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Autofac" Version="6.3.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ProjectReference Include="..\..\src\EasyCaching.Core\EasyCaching.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="protobuf-net" Version="3.0.101" />
<PackageReference Include="protobuf-net" Version="3.1.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Configurations\" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
17 changes: 17 additions & 0 deletions src/EasyCaching.CSRedis/DefaultCSRedisCachingProvider.Keys.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,22 @@ public List<string> SearchKeys(string cacheKey, int? count)

return keys;
}

public async Task<List<string>> SearchKeysAsync(string cacheKey, int? count)
{
var keys = new List<string>();

long nextCursor = 0;
do
{
var scanResult = await _cache.ScanAsync(nextCursor, cacheKey, count ?? 250);
nextCursor = scanResult.Cursor;
var items = scanResult.Items;
keys.AddRange(items);
}
while (nextCursor != 0);

return keys;
}
}
}
Loading

0 comments on commit 2251cb7

Please sign in to comment.