Update CacheNulls default to true (dotnetcore#508)

* fix: update CacheNulls to true dotnetcore#506 * fix: update baset test version to 1.9.3 * fix: fixed cache unll value judgment of SQLLite BaseGet * fixed cache unll value judgment of LiteDB BaseGet
vipwan · Nov 20, 2023 · 2c78256 · 2c78256
1 parent 699742a
commit 2c78256
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/src/EasyCaching.Core/Configurations/BaseProviderOptions.cs b/src/EasyCaching.Core/Configurations/BaseProviderOptions.cs
@@ -42,8 +42,8 @@ public class BaseProviderOptions
  public string SerializerName { get; set; }
 
  /// <summary>
- /// Get or sets whether null values should be cached, default is false.
+ /// Get or sets whether null values should be cached, default is true.
  /// </summary>
- public bool CacheNulls { get; set; } = false;
+ public bool CacheNulls { get; set; } = true;
  }
 }
diff --git a/src/EasyCaching.LiteDB/DefaultLiteDBCachingProvider.cs b/src/EasyCaching.LiteDB/DefaultLiteDBCachingProvider.cs
@@ -166,14 +166,14 @@ public override CacheValue<T> BaseGet<T>(string cacheKey)
 
  var cacheItem = _cache.FindOne(c => c.cachekey == cacheKey && c.expiration > DateTimeOffset.UtcNow.ToUnixTimeSeconds());
 
- if (cacheItem != null || _options.CacheNulls)
+ if (cacheItem != null)
  {
  if (_options.EnableLogging)
  _logger?.LogInformation($"Cache Hit : cachekey = {cacheKey}");
 
  CacheStats.OnHit();
 
- return string.IsNullOrWhiteSpace(cacheItem?.cachevalue) 
+ return cacheItem.cachevalue == null
  ? CacheValue<T>.Null 
  : new CacheValue<T>(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(cacheItem.cachevalue), true);
  }

diff --git a/src/EasyCaching.SQLite/DefaultSQLiteCachingProvider.cs b/src/EasyCaching.SQLite/DefaultSQLiteCachingProvider.cs
@@ -85,15 +85,15 @@ public DefaultSQLiteCachingProvider(
  /// </summary>
  /// <param name="dbProvider"></param>
  private void InitDb(ISQLiteDatabaseProvider dbProvider)
- { 
+ {
  var conn = dbProvider.GetConnection();
 
  if (conn.State == System.Data.ConnectionState.Closed)
  {
  conn.Open();
  }
 
- conn.Execute(ConstSQL.CREATESQL); 
+ conn.Execute(ConstSQL.CREATESQL);
  }
 
  /// <summary>
@@ -159,16 +159,16 @@ public override CacheValue<T> BaseGet<T>(string cacheKey)
  name = _name
  }).FirstOrDefault();
 
- if (!string.IsNullOrWhiteSpace(dbResult) || _options.CacheNulls)
+ if (!string.IsNullOrWhiteSpace(dbResult))
  {
  CacheStats.OnHit();
 
  if (_options.EnableLogging)
  _logger?.LogInformation($"Cache Hit : cachekey = {cacheKey}");
-
- return string.IsNullOrWhiteSpace(dbResult) 
+ var cacheValue = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(dbResult);
+ return cacheValue == null
  ? CacheValue<T>.Null
- : new CacheValue<T>(Newtonsoft.Json.JsonConvert.DeserializeObject<T>(dbResult), true);
+ : new CacheValue<T>(cacheValue, true);
  }
  else
  {
@@ -221,7 +221,7 @@ public override void BaseSet<T>(string cacheKey, T cacheValue, TimeSpan expirati
  expiration = expiration.Ticks / 10000000
  });
 
- } 
+ }
 
  /// <summary>
  /// Removes cached item by cachekey's prefix.
@@ -247,10 +247,10 @@ public override void BaseRemoveByPattern(string pattern)
 
  if (_options.EnableLogging)
  _logger?.LogInformation($"RemoveByPattern : pattern = {pattern}");
- 
+
  _cache.Execute(ConstSQL.REMOVEBYLIKESQL, new { cachekey = pattern.Replace('*', '%'), name = _name });
  }
- 
+
  /// <summary>
  /// Sets all.
  /// </summary>
@@ -276,7 +276,7 @@ public override void BaseSetAll<T>(IDictionary<string, T> values, TimeSpan expir
  }
 
  tran.Commit();
- } 
+ }
 
  /// <summary>
  /// Gets all.
@@ -339,7 +339,7 @@ public override IDictionary<string, CacheValue<T>> BaseGetByPrefix<T>(string pre
 
  return GetDict<T>(list);
  }
- 
+
  /// <summary>
  /// Removes all.
  /// </summary>

diff --git a/test/EasyCaching.UnitTests/CachingTests/MemoryCachingProviderTest.cs b/test/EasyCaching.UnitTests/CachingTests/MemoryCachingProviderTest.cs
@@ -1,8 +1,7 @@
-using EasyCaching.Core.Configurations;
-using EasyCaching.Core.DistributedLock;
-
 namespace EasyCaching.UnitTests
 {
+ using EasyCaching.Core.Configurations;
+ using EasyCaching.Core.DistributedLock;
  using EasyCaching.Core;
  using EasyCaching.InMemory;
  using Microsoft.Extensions.Configuration;

diff --git a/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj b/test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj
@@ -17,7 +17,7 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="EasyCaching.BaseTest" Version="1.9.0" />
+ <PackageReference Include="EasyCaching.BaseTest" Version="1.9.3" />
  <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />