lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'issue/caching' into 1.x

Browse Source
This commit is contained in:
Zoltán Lehóczky
2015-02-21 15:25:32 +01:00
parent 87b352e439 e84a180412
commit fbb1346703
6 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Orchard.Web/Modules/Orchard.Caching/Helpers/CachingExtensions.cs Normal file
View File

@@ -0,0 +1,42 @@
using System;
// ReSharper disable once CheckNamespace
namespace Orchard.Caching.Services {
public static class CachingExtensions {
public static T Get<T>(this ICacheStorageProvider provider, string key) {
return (T)provider.Get<T>(key);
}
public static object Get(this ICacheService cacheService, string key) {
return cacheService.Get<object>(key);
}
public static T Get<T>(this ICacheService cacheService, string key) {
return Get<T>(cacheService, key, null);
}
public static T Get<T>(this ICacheService cacheService, string key, TimeSpan validFor) {
return Get<T>(cacheService, key, null, validFor);
}
public static T Get<T>(this ICacheService cacheService, string key, Func<T> factory) {
return Get(cacheService, key, factory, TimeSpan.MinValue);
}
public static T Get<T>(this ICacheService cacheService, string key, Func<T> factory, TimeSpan validFor) {
var result = cacheService.GetObject<T>(key);
if (result == null && factory != null) {
var computed = factory();
if (validFor == TimeSpan.MinValue)
cacheService.Put(key, computed);
else
cacheService.Put(key, computed, validFor);
return computed;
}
return (T)result;
}
}
}

2
src/Orchard.Web/Modules/Orchard.Caching/Module.txt
View File

@@ -8,4 +8,4 @@ Description: Provides an API to cache business data.
Features:
Orchard.Caching:
Description: Provides an API to cache business data.
Category: Performance
Category: Performance

1
src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj
View File

@@ -75,6 +75,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Helpers\CachingExtensions.cs" />
<Compile Include="Services\DefaultCacheService.cs" />
<Compile Include="Services\DefaultCacheStorageProvider.cs" />
<Compile Include="Services\ICacheService.cs" />

2
src/Orchard.Web/Modules/Orchard.Caching/Services/DefaultCacheService.cs
View File

@@ -16,7 +16,7 @@ namespace Orchard.Caching.Services {
_prefix = shellSettings.Name;
}
public object Get<T>(string key) {
public object GetObject<T>(string key) {
return _cacheStorageProvider.Get<T>(BuildFullKey(key));
}

30
src/Orchard.Web/Modules/Orchard.Caching/Services/DefaultCacheStorageProvider.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Globalization;
using System.Runtime.Caching;
using Orchard.Environment.Configuration;
using Orchard.Services;
namespace Orchard.Caching.Services {
@@ -10,19 +9,17 @@ namespace Orchard.Caching.Services {
public class DefaultCacheStorageProvider : ICacheStorageProvider, ISingletonDependency {
private event EventHandler Signaled;
private readonly ShellSettings _shellSettings;
private readonly IClock _clock;
// MemoryCache is optimal with one instance, see: http://stackoverflow.com/questions/8463962/using-multiple-instances-of-memorycache/13425322#13425322
private readonly MemoryCache _cache = MemoryCache.Default;
public DefaultCacheStorageProvider(ShellSettings shellSettings, IClock clock) {
_shellSettings = shellSettings;
public DefaultCacheStorageProvider(IClock clock) {
_clock = clock;
}
public void Put<T>(string key, T value) {
// Keys are already prefixed by DefaultCacheService so no need to do it here again.
_cache.Set(key, value, GetCacheItemPolicy(MemoryCache.InfiniteAbsoluteExpiration));
_cache.Set(key, value, GetCacheItemPolicy(ObjectCache.InfiniteAbsoluteExpiration));
}
public void Put<T>(string key, T value, TimeSpan validFor) {
@@ -40,22 +37,15 @@ namespace Orchard.Caching.Services {
}
public object Get<T>(string key) {
var value = _cache.Get(key);
// if the provided expression is non-null, and the provided object can
// be cast to the provided type without causing an exception to be thrown
if(value is T) {
return (T)value;
}
return null;
return _cache.Get(key);
}
private CacheItemPolicy GetCacheItemPolicy(DateTimeOffset absoluteExpiration) {
var cacheItemPolicy = new CacheItemPolicy();
var cacheItemPolicy = new CacheItemPolicy {
AbsoluteExpiration = absoluteExpiration,
SlidingExpiration = ObjectCache.NoSlidingExpiration
};
cacheItemPolicy.AbsoluteExpiration = absoluteExpiration;
cacheItemPolicy.SlidingExpiration = MemoryCache.NoSlidingExpiration;
cacheItemPolicy.ChangeMonitors.Add(new TenantCacheClearMonitor(this));
return cacheItemPolicy;
@@ -72,17 +62,17 @@ namespace Orchard.Caching.Services {
public TenantCacheClearMonitor(DefaultCacheStorageProvider storageProvider) {
_storageProvider = storageProvider;
_storageProvider.Signaled += OnSignalRaised;
base.InitializationComplete();
InitializationComplete();
}
protected override void Dispose(bool disposing) {
base.Dispose();
Dispose();
_storageProvider.Signaled -= OnSignalRaised;
}
private void OnSignalRaised(object sender, EventArgs e) {
// Cache objects are obligated to remove entry upon change notification.
base.OnChanged(null);
OnChanged(null);
}
}
}

30
src/Orchard.Web/Modules/Orchard.Caching/Services/ICacheService.cs
View File

@@ -2,7 +2,7 @@
namespace Orchard.Caching.Services {
public interface ICacheService : IDependency {
object Get<T>(string key);
object GetObject<T>(string key);
void Put<T>(string key, T value);
void Put<T>(string key, T value, TimeSpan validFor);
@@ -10,32 +10,4 @@ namespace Orchard.Caching.Services {
void Remove(string key);
void Clear();
}
public static class CachingExtensions {
public static object Get<T>(this ICacheService cacheService, string key, Func<T> factory) {
var result = cacheService.Get<T>(key);
if (result == null) {
var computed = factory();
cacheService.Put(key, computed);
return computed;
}
// try to convert to T
return result;
}
public static object Get<T>(this ICacheService cacheService, string key, Func<T> factory, TimeSpan validFor) {
var result = cacheService.Get<T>(key);
if (result == null) {
var computed = factory();
cacheService.Put(key, computed, validFor);
return computed;
}
// try to convert to T
return result;
}
}
}