bugfixing

imperugo · Oct 9, 2019 · dfd95a6 · dfd95a6
1 parent 314dc97
commit dfd95a6
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 17 deletions.
diff --git a/...tackExchange.Redis.Extensions.AspNetCore/StackExchange.Redis.Extensions.AspNetCore.csproj b/...tackExchange.Redis.Extensions.AspNetCore/StackExchange.Redis.Extensions.AspNetCore.csproj
@@ -5,7 +5,7 @@
  <Title>StackExchange.Redis.Extensions.AspNetCore is a library that has a set of extensions method fpr ASP.NET Core.</Title>
  <Summary>StackExchange.Redis.Extensions.AspNetCore is a library that has a set of extensions method fpr ASP.NET Core with the scope to simply the library configuration into the dependency injection</Summary>
  <Description>StackExchange.Redis.Extensions.AspNetCore is a library that has a set of extensions method fpr ASP.NET Core</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>

diff --git a/src/StackExchange.Redis.Extensions.Binary/StackExchange.Redis.Extensions.Binary.csproj b/src/StackExchange.Redis.Extensions.Binary/StackExchange.Redis.Extensions.Binary.csproj
@@ -8,7 +8,7 @@
  <Description>StackExchange.Redis.Extensions is a library that extends StackExchange.Redis allowing you a set of functionality needed by common applications.
 
 This implementation is based on Microsoft's BinarySerializer</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>

diff --git a/src/StackExchange.Redis.Extensions.Core/Configuration/RedisConfiguration.cs b/src/StackExchange.Redis.Extensions.Core/Configuration/RedisConfiguration.cs
@@ -19,6 +19,20 @@ public class RedisConfiguration
  private ServerEnumerationStrategy serverEnumerationStrategy;
  private int poolSize = 5;
  private string[] excludeCommands;
+ private string configurationChannel = null;
+
+ /// <summary>
+ /// The key separation prefix used for all cache entries
+ /// </summary>
+ public string ConfigurationChannel
+ {
+ get => configurationChannel;
+ set
+ {
+ configurationChannel = value;
+ ResetConfigurationOptions();
+ }
+ }
 
  /// <summary>
  /// The key separation prefix used for all cache entries
@@ -208,6 +222,7 @@ public ConfigurationOptions ConfigurationOptions
  ConnectTimeout = ConnectTimeout,
  SyncTimeout = SyncTimeout,
  AbortOnConnectFail = AbortOnConnectFail,
+ ConfigurationChannel = ConfigurationChannel
  };
 
  if (ExcludeCommands != null)

diff --git a/src/StackExchange.Redis.Extensions.Core/Implementations/RedisDatabase.cs b/src/StackExchange.Redis.Extensions.Core/Implementations/RedisDatabase.cs
@@ -121,7 +121,7 @@ public async Task<T> GetAsync<T>(string key, DateTimeOffset expiresAt, CommandFl
  if (!Equals(result, default(T)))
  await Database.KeyExpireAsync(key, expiresAt.UtcDateTime.Subtract(DateTime.UtcNow));
 
- return default;
+ return result;
  }
 
  public async Task<T> GetAsync<T>(string key, TimeSpan expiresIn, CommandFlags flag = CommandFlags.None)
@@ -131,7 +131,7 @@ public async Task<T> GetAsync<T>(string key, TimeSpan expiresIn, CommandFlags fl
  if (!Equals(result, default(T)))
  await Database.KeyExpireAsync(key, expiresIn);
 
- return default;
+ return result;
  }
 
  public bool Add<T>(string key, T value, When when = When.Always, CommandFlags flag = CommandFlags.None)

diff --git a/src/StackExchange.Redis.Extensions.Core/StackExchange.Redis.Extensions.Core.csproj b/src/StackExchange.Redis.Extensions.Core/StackExchange.Redis.Extensions.Core.csproj
@@ -13,7 +13,7 @@ To store complex data It requires one of the following implementations:
 - StackExchange.Redis.Extensions.Protobuf
 - StackExchange.Redis.Extensions.Utf8Json
 - StackExchange.Redis.Extensions.Binary</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <IncludeSource>false</IncludeSource>
  <IncludeSymbols>true</IncludeSymbols>

diff --git a/src/StackExchange.Redis.Extensions.Core/StackExchangeRedisCacheClient.cs b/src/StackExchange.Redis.Extensions.Core/StackExchangeRedisCacheClient.cs
@@ -356,7 +356,7 @@ public async Task<T> GetAsync<T>(string key, DateTimeOffset expiresAt, CommandFl
  await Database.KeyExpireAsync(key, expiresAt.Subtract(DateTime.Now));
  }
 
- return default(T);
+ return result;
  }
 
  /// <summary>
@@ -378,7 +378,7 @@ public async Task<T> GetAsync<T>(string key, TimeSpan expiresIn, CommandFlags fl
  await Database.KeyExpireAsync(key, expiresIn);
  }
 
- return default(T);
+ return result;
  }
 
  /// <summary>

diff --git a/src/StackExchange.Redis.Extensions.Jil/StackExchange.Redis.Extensions.Jil.csproj b/src/StackExchange.Redis.Extensions.Jil/StackExchange.Redis.Extensions.Jil.csproj
@@ -8,7 +8,7 @@
  <Description>StackExchange.Redis.Extensions is a library that extends StackExchange.Redis allowing you a set of functionality needed by common applications.
 
 This implementation is based on Jil serializer.</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>

diff --git a/....Extensions.LegacyConfiguration/StackExchange.Redis.Extensions.LegacyConfiguration.nuspec b/....Extensions.LegacyConfiguration/StackExchange.Redis.Extensions.LegacyConfiguration.nuspec
@@ -3,7 +3,7 @@
  <metadata>
  <id>StackExchange.Redis.Extensions.LegacyConfiguration</id>
  <title>StackExchange.Redis.Extensions.LegacyConfiguration</title>
- <version>5.2.0</version>
+ <version>5.3.0</version>
  <authors>Ugo Lattanzi</authors>
  <owners>Ugo Lattanzi</owners>
  <licenseUrl>https://github.com/imperugo/StackExchange.Redis.Extensions/blob/master/LICENSE</licenseUrl>
@@ -23,7 +23,7 @@
  <language>en-US</language>
  <tags>Async Redis NoSQL Client Distributed Cache PubSub Messaging</tags>
  <dependencies>
- <dependency id="StackExchange.Redis.Extensions.Core" version="5.2.0" />
+ <dependency id="StackExchange.Redis.Extensions.Core" version="5.3.0" />
  </dependencies>
  </metadata>
 </package>
diff --git a/src/StackExchange.Redis.Extensions.MsgPack/StackExchange.Redis.Extensions.MsgPack.csproj b/src/StackExchange.Redis.Extensions.MsgPack/StackExchange.Redis.Extensions.MsgPack.csproj
@@ -8,7 +8,7 @@
  <Description>StackExchange.Redis.Extensions is a library that extends StackExchange.Redis allowing you a set of functionality needed by common applications.
 
 This implementation is based on MsgPack serializer.</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>

diff --git a/...tackExchange.Redis.Extensions.Newtonsoft/StackExchange.Redis.Extensions.Newtonsoft.csproj b/...tackExchange.Redis.Extensions.Newtonsoft/StackExchange.Redis.Extensions.Newtonsoft.csproj
@@ -8,7 +8,7 @@
  <Description>StackExchange.Redis.Extensions is a library that extends StackExchange.Redis allowing you a set of functionality needed by common applications.
 
 This implementation is based on Newtonsoft Json.Net serializer.</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>

diff --git a/src/StackExchange.Redis.Extensions.Protobuf/StackExchange.Redis.Extensions.Protobuf.csproj b/src/StackExchange.Redis.Extensions.Protobuf/StackExchange.Redis.Extensions.Protobuf.csproj
@@ -8,7 +8,7 @@
  <Description>StackExchange.Redis.Extensions is a library that extends StackExchange.Redis allowing you a set of functionality needed by common applications.
 
 This implementation is based on Protobuf serializer.</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>
@@ -52,7 +52,7 @@ This implementation is based on Protobuf serializer.</Description>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="protobuf-net" Version="2.4.0" />
+ <PackageReference Include="protobuf-net" Version="2.4.1" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/StackExchange.Redis.Extensions.Utf8Json/StackExchange.Redis.Extensions.Utf8Json.csproj b/src/StackExchange.Redis.Extensions.Utf8Json/StackExchange.Redis.Extensions.Utf8Json.csproj
@@ -8,7 +8,7 @@
  <Description>StackExchange.Redis.Extensions is a library that extends StackExchange.Redis allowing you a set of functionality needed by common applications.
 
 This implementation is based on UTF8Json serializer.</Description>
- <VersionPrefix>5.2.0</VersionPrefix>
+ <VersionPrefix>5.3.0</VersionPrefix>
  <!--<VersionSuffix>pre</VersionSuffix>-->
  <Authors>Ugo Lattanzi</Authors>
  <Copyright>Ugo Lattanzi</Copyright>

diff --git a/tests/StackExchange.Redis.Extensions.Tests/CacheClientTestBase.cs b/tests/StackExchange.Redis.Extensions.Tests/CacheClientTestBase.cs
@@ -221,7 +221,25 @@ public async Task SearchKeys_With_Key_Prefix_Should_Return_All_Database_Keys()
  Assert.True(keys.Count() == 2);
  }
 
- [Fact]
+ [Fact]
+ public async Task SearchKeys_With_Start_Should_Return_All_Keys()
+ {
+ var values = Range(0, 10)
+ .Select(i => new TestClass<string>($"mykey{i}", Guid.NewGuid().ToString()))
+ .ToArray();
+
+ foreach (var x in values)
+ {
+ await Db.StringSetAsync(x.Key, x.Value);
+ }
+
+ var result = (await Sut.GetDbFromConfiguration().SearchKeysAsync("*")).OrderBy(k => k).ToList();
+
+ Assert.True(result.Count == 10);
+ }
+
+
+ [Fact]
  public async Task SearchKeys_With_Key_Prefix_Should_Return_Keys_Without_Prefix()
  {
  var values = Range(0, 10)

diff --git a/tests/StackExchange.Redis.Extensions.Tests/StackExchange.Redis.Extensions.Tests.csproj b/tests/StackExchange.Redis.Extensions.Tests/StackExchange.Redis.Extensions.Tests.csproj
@@ -15,7 +15,7 @@
  <PackageReference Include="Jil" Version="2.17.0" />
  <PackageReference Include="MsgPack.Cli" Version="1.0.1" />
  <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
- <PackageReference Include="protobuf-net" Version="2.4.0" />
+ <PackageReference Include="protobuf-net" Version="2.4.1" />
  <PackageReference Include="Utf8Json" Version="1.3.7" />
  <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
  </ItemGroup>